Python 3 fix: DeprecationWarning: Please use assertRaisesRegex instead

This commit is contained in:
hugovk 2014-03-12 15:32:27 +02:00
parent 506bee4fe4
commit 7019b1b946

View file

@ -31,15 +31,10 @@ class TestPyLast(unittest.TestCase):
secrets = None secrets = None
# Based on django/utils/six.py to remove Python 3's # To remove Python 3's
# "DeprecationWarning: Please use assertRaisesRegex instead" # "DeprecationWarning: Please use assertRaisesRegex instead"
if sys.version_info[0] == 2: if sys.version_info[0] == 2:
_assertRaisesRegex = "assertRaisesRegexp" assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
else:
_assertRaisesRegex = "assertRaisesRegex"
def assertRaisesRegex(self, *args, **kwargs):
return getattr(self, self._assertRaisesRegex)(*args, **kwargs)
def unix_timestamp(self): def unix_timestamp(self):
return int(time.time()) return int(time.time())