diff --git a/zerver/lib/test_classes.py b/zerver/lib/test_classes.py index f991494d53..c98069bc31 100644 --- a/zerver/lib/test_classes.py +++ b/zerver/lib/test_classes.py @@ -107,14 +107,6 @@ class ZulipTestCase(TestCase): functions have to fake out the linter by using a local variable called django_client to fool the regext. ''' - def __init__(self, *args, **kwargs): - # type: (*Any, **Any) -> None - # This method should be removed when we migrate to version 3 of Python - import six - if six.PY2: - self.assertRaisesRegex = self.assertRaisesRegexp - super(ZulipTestCase, self).__init__(*args, **kwargs) - DEFAULT_REALM = Realm.objects.get(string_id='zulip') @instrument_url diff --git a/zerver/tests/test_decorators.py b/zerver/tests/test_decorators.py index 46036ea20f..476bcb991d 100644 --- a/zerver/tests/test_decorators.py +++ b/zerver/tests/test_decorators.py @@ -40,14 +40,6 @@ from zerver.models import \ import ujson class DecoratorTestCase(TestCase): - def __init__(self, *args, **kwargs): - # type: (*Any, **Any) -> None - # This method should be removed when we migrate to version 3 of Python - import six - if six.PY2: - self.assertRaisesRegex = self.assertRaisesRegexp - super(TestCase, self).__init__(*args, **kwargs) - def test_get_client_name(self): # type: () -> None class Request(object):