python compat cleanup -- use magic super() calls

18 files changed, 42 insertions, 43 deletions

diff --git a/passlib/tests/test_context.py b/passlib/tests/test_context.py
index 8bb4e3e..ea11f4e 100644
--- a/passlib/tests/test_context.py
+++ b/passlib/tests/test_context.py
@@ -170,7 +170,7 @@ sha512_crypt__min_rounds = 45000
     # setup
     #===================================================================
     def setUp(self):
-        super(CryptContextTest, self).setUp()
+        super().setUp()
         warnings.filterwarnings("ignore", "The 'all' scheme is deprecated.*")
         warnings.filterwarnings("ignore", ".*'scheme' keyword is deprecated as of Passlib 1.7.*")
 
diff --git a/passlib/tests/test_crypto_builtin_md4.py b/passlib/tests/test_crypto_builtin_md4.py
index 4f5b798..e74b924 100644
--- a/passlib/tests/test_crypto_builtin_md4.py
+++ b/passlib/tests/test_crypto_builtin_md4.py
@@ -118,7 +118,7 @@ class MD4_SSL_Test(_Common_MD4_Test):
     #       this is more to test our test is correct :)
 
     def setUp(self):
-        super(MD4_SSL_Test, self).setUp()
+        super().setUp()
 
         # make sure we're using right constructor.
         self.assertEqual(self.get_md4_const().__module__, "hashlib")
@@ -128,7 +128,7 @@ class MD4_Builtin_Test(_Common_MD4_Test):
     descriptionPrefix = "passlib.crypto._md4.md4()"
 
     def setUp(self):
-        super(MD4_Builtin_Test, self).setUp()
+        super().setUp()
 
         if has_native_md4():
 
diff --git a/passlib/tests/test_crypto_scrypt.py b/passlib/tests/test_crypto_scrypt.py
index 04efdd9..5009db0 100644
--- a/passlib/tests/test_crypto_scrypt.py
+++ b/passlib/tests/test_crypto_scrypt.py
@@ -313,7 +313,7 @@ class _CommonScryptTest(TestCase):
     def setUp(self):
         assert self.backend
         scrypt_mod._set_backend(self.backend)
-        super(_CommonScryptTest, self).setUp()
+        super().setUp()
 
     #=============================================================================
     # reference vectors
@@ -598,7 +598,7 @@ class BuiltinScryptTest(_CommonScryptTest):
     backend = "builtin"
 
     def setUp(self):
-        super(BuiltinScryptTest, self).setUp()
+        super().setUp()
         warnings.filterwarnings("ignore", "(?i)using builtin scrypt backend",
                                 category=exc.PasslibSecurityWarning)
 
diff --git a/passlib/tests/test_ext_django.py b/passlib/tests/test_ext_django.py
index 2260d66..b43afea 100644
--- a/passlib/tests/test_ext_django.py
+++ b/passlib/tests/test_ext_django.py
@@ -281,7 +281,7 @@ class _ExtensionSupport(object):
 class _ExtensionTest(TestCase, _ExtensionSupport):
 
     def setUp(self):
-        super(_ExtensionTest, self).setUp()
+        super().setUp()
 
         self.require_TEST_MODE("default")
 
@@ -627,7 +627,7 @@ class ExtensionBehaviorTest(DjangoBehaviorTest):
             )
 
     def setUp(self):
-        super(ExtensionBehaviorTest, self).setUp()
+        super().setUp()
         self.load_extension(PASSLIB_CONFIG=self.config)
 
 class DjangoExtensionTest(_ExtensionTest):
diff --git a/passlib/tests/test_ext_django_source.py b/passlib/tests/test_ext_django_source.py
index cc8c25f..a6da6b6 100644
--- a/passlib/tests/test_ext_django_source.py
+++ b/passlib/tests/test_ext_django_source.py
@@ -207,7 +207,7 @@ if test_hashers_mod:
         def tearDown(self):
             # NOTE: could rely on addCleanup() instead, but need py26 compat
             self.unload_extension()
-            super(HashersTest, self).tearDown()
+            super().tearDown()
 
         #==================================================================
         # skip a few methods that can't be replicated properly
diff --git a/passlib/tests/test_handlers.py b/passlib/tests/test_handlers.py
index 14623e1..e3a3e30 100644
--- a/passlib/tests/test_handlers.py
+++ b/passlib/tests/test_handlers.py
@@ -205,7 +205,7 @@ class _bsdi_crypt_test(HandlerCase):
     def test_77_fuzz_input(self, **kwds):
         # we want to generate even rounds to verify it's correct, but want to ignore warnings
         warnings.filterwarnings("ignore", "bsdi_crypt rounds should be odd.*")
-        super(_bsdi_crypt_test, self).test_77_fuzz_input(**kwds)
+        super().test_77_fuzz_input(**kwds)
 
     def test_needs_update_w_even_rounds(self):
         """needs_update() should flag even rounds"""
@@ -703,7 +703,7 @@ class _ldap_sha1_crypt_test(HandlerCase):
 
     def populate_settings(self, kwds):
         kwds.setdefault("rounds", 10)
-        super(_ldap_sha1_crypt_test, self).populate_settings(kwds)
+        super().populate_settings(kwds)
 
     def test_77_fuzz_input(self, **ignored):
         raise self.skipTest("unneeded")
@@ -1751,7 +1751,7 @@ class unix_disabled_test(HandlerCase):
     def test_76_hash_border(self):
         # so empty strings pass
         self.accepts_all_hashes = True
-        super(unix_disabled_test, self).test_76_hash_border()
+        super().test_76_hash_border()
 
     def test_90_special(self):
         """test marker option & special behavior"""
diff --git a/passlib/tests/test_handlers_argon2.py b/passlib/tests/test_handlers_argon2.py
index a5309d2..3f800ba 100644
--- a/passlib/tests/test_handlers_argon2.py
+++ b/passlib/tests/test_handlers_argon2.py
@@ -199,7 +199,7 @@ class _base_argon2_test(HandlerCase):
     ]
 
     def setUpWarnings(self):
-        super(_base_argon2_test, self).setUpWarnings()
+        super().setUpWarnings()
         warnings.filterwarnings("ignore", ".*Using argon2pure backend.*")
 
     def do_stub_encrypt(self, handler=None, **settings):
@@ -212,7 +212,7 @@ class _base_argon2_test(HandlerCase):
             assert self.checksum
             return self.to_string()
         else:
-            return super(_base_argon2_test, self).do_stub_encrypt(handler, **settings)
+            return super().do_stub_encrypt(handler, **settings)
 
     def test_03_legacy_hash_workflow(self):
         # override base method
diff --git a/passlib/tests/test_handlers_bcrypt.py b/passlib/tests/test_handlers_bcrypt.py
index 683b9ba..abe44ec 100644
--- a/passlib/tests/test_handlers_bcrypt.py
+++ b/passlib/tests/test_handlers_bcrypt.py
@@ -177,7 +177,7 @@ class _bcrypt_test(HandlerCase):
                 self.addCleanup(os.environ.__delitem__, key)
             os.environ[key] = "true"
 
-        super(_bcrypt_test, self).setUp()
+        super().setUp()
 
         # silence this warning, will come up a bunch during testing of old 2a hashes.
         warnings.filterwarnings("ignore", ".*backend is vulnerable to the bsd wraparound bug.*")
@@ -186,7 +186,7 @@ class _bcrypt_test(HandlerCase):
         # builtin is still just way too slow.
         if self.backend == "builtin":
             kwds.setdefault("rounds", 4)
-        super(_bcrypt_test, self).populate_settings(kwds)
+        super().populate_settings(kwds)
 
     #===================================================================
     # fuzz testing
@@ -523,14 +523,14 @@ class _bcrypt_sha256_test(HandlerCase):
             else:
                 self.addCleanup(os.environ.__delitem__, key)
             os.environ[key] = "enabled"
-        super(_bcrypt_sha256_test, self).setUp()
+        super().setUp()
         warnings.filterwarnings("ignore", ".*backend is vulnerable to the bsd wraparound bug.*")
 
     def populate_settings(self, kwds):
         # builtin is still just way too slow.
         if self.backend == "builtin":
             kwds.setdefault("rounds", 4)
-        super(_bcrypt_sha256_test, self).populate_settings(kwds)
+        super().populate_settings(kwds)
 
     #===================================================================
     # override ident tests for now
diff --git a/passlib/tests/test_handlers_django.py b/passlib/tests/test_handlers_django.py
index d5ed9c6..9d03a98 100644
--- a/passlib/tests/test_handlers_django.py
+++ b/passlib/tests/test_handlers_django.py
@@ -297,7 +297,7 @@ class django_bcrypt_test(HandlerCase, _DjangoHelper):
     def populate_settings(self, kwds):
         # speed up test w/ lower rounds
         kwds.setdefault("rounds", 4)
-        super(django_bcrypt_test, self).populate_settings(kwds)
+        super().populate_settings(kwds)
 
     class FuzzHashGenerator(HandlerCase.FuzzHashGenerator):
 
@@ -347,7 +347,7 @@ class django_bcrypt_sha256_test(HandlerCase, _DjangoHelper):
     def populate_settings(self, kwds):
         # speed up test w/ lower rounds
         kwds.setdefault("rounds", 4)
-        super(django_bcrypt_sha256_test, self).populate_settings(kwds)
+        super().populate_settings(kwds)
 
     class FuzzHashGenerator(HandlerCase.FuzzHashGenerator):
 
@@ -381,7 +381,7 @@ class django_argon2_test(HandlerCase, _DjangoHelper):
     ]
 
     def setUpWarnings(self):
-        super(django_argon2_test, self).setUpWarnings()
+        super().setUpWarnings()
         warnings.filterwarnings("ignore", ".*Using argon2pure backend.*")
 
     def do_stub_encrypt(self, handler=None, **settings):
diff --git a/passlib/tests/test_handlers_pbkdf2.py b/passlib/tests/test_handlers_pbkdf2.py
index e1fa0c9..658f2ce 100644
--- a/passlib/tests/test_handlers_pbkdf2.py
+++ b/passlib/tests/test_handlers_pbkdf2.py
@@ -244,7 +244,7 @@ class scram_test(HandlerCase):
     ]
 
     def setUp(self):
-        super(scram_test, self).setUp()
+        super().setUp()
 
         # some platforms lack stringprep (e.g. Jython, IronPython)
         self.require_stringprep()
diff --git a/passlib/tests/test_handlers_scrypt.py b/passlib/tests/test_handlers_scrypt.py
index 5ab6d9f..2ce6463 100644
--- a/passlib/tests/test_handlers_scrypt.py
+++ b/passlib/tests/test_handlers_scrypt.py
@@ -86,14 +86,14 @@ class _scrypt_test(HandlerCase):
     ]
 
     def setUpWarnings(self):
-        super(_scrypt_test, self).setUpWarnings()
+        super().setUpWarnings()
         warnings.filterwarnings("ignore", ".*using builtin scrypt backend.*")
 
     def populate_settings(self, kwds):
         # builtin is still just way too slow.
         if self.backend == "builtin":
             kwds.setdefault("rounds", 6)
-        super(_scrypt_test, self).populate_settings(kwds)
+        super().populate_settings(kwds)
 
     class FuzzHashGenerator(HandlerCase.FuzzHashGenerator):
 
diff --git a/passlib/tests/test_pwd.py b/passlib/tests/test_pwd.py
index 2c983cd..cc7bad3 100644
--- a/passlib/tests/test_pwd.py
+++ b/passlib/tests/test_pwd.py
@@ -66,7 +66,7 @@ class WordGeneratorTest(TestCase):
     descriptionPrefix = "passlib.pwd.genword()"
 
     def setUp(self):
-        super(WordGeneratorTest, self).setUp()
+        super().setUp()
 
         # patch some RNG references so they're reproducible.
         from passlib.pwd import SequenceGenerator
diff --git a/passlib/tests/test_registry.py b/passlib/tests/test_registry.py
index 2e00977..09d8dfd 100644
--- a/passlib/tests/test_registry.py
+++ b/passlib/tests/test_registry.py
@@ -39,7 +39,7 @@ class RegistryTest(TestCase):
     descriptionPrefix = "passlib.registry"
 
     def setUp(self):
-        super(RegistryTest, self).setUp()
+        super().setUp()
 
         # backup registry state & restore it after test.
         locations = dict(registry._locations)
diff --git a/passlib/tests/test_totp.py b/passlib/tests/test_totp.py
index 999c799..e9c6dd9 100644
--- a/passlib/tests/test_totp.py
+++ b/passlib/tests/test_totp.py
@@ -396,7 +396,7 @@ class TotpTest(TestCase):
     # setup
     #=============================================================================
     def setUp(self):
-        super(TotpTest, self).setUp()
+        super().setUp()
 
         # clear norm_hash_name() cache so 'unknown hash' warnings get emitted each time
         from passlib.crypto.digest import lookup_hash
diff --git a/passlib/tests/test_utils_handlers.py b/passlib/tests/test_utils_handlers.py
index a9c3b05..f665aac 100644
--- a/passlib/tests/test_utils_handlers.py
+++ b/passlib/tests/test_utils_handlers.py
@@ -51,7 +51,7 @@ class SkeletonTest(TestCase):
             checksum_size = 1
 
             def __init__(self, flag=False, **kwds):
-                super(d1, self).__init__(**kwds)
+                super().__init__(**kwds)
                 self.flag = flag
 
             def _calc_checksum(self, secret):
diff --git a/passlib/tests/test_utils_md4.py b/passlib/tests/test_utils_md4.py
index 5d824a1..e3e04d4 100644
--- a/passlib/tests/test_utils_md4.py
+++ b/passlib/tests/test_utils_md4.py
@@ -29,7 +29,7 @@ class Legacy_MD4_Test(_Common_MD4_Test):
     descriptionPrefix = "passlib.utils.md4.md4()"
 
     def setUp(self):
-        super(Legacy_MD4_Test, self).setUp()
+        super().setUp()
         warnings.filterwarnings("ignore", ".*passlib.utils.md4.*deprecated", DeprecationWarning)
 
     def get_md4_const(self):
diff --git a/passlib/tests/test_utils_pbkdf2.py b/passlib/tests/test_utils_pbkdf2.py
index f87726d..0e10248 100644
--- a/passlib/tests/test_utils_pbkdf2.py
+++ b/passlib/tests/test_utils_pbkdf2.py
@@ -52,7 +52,7 @@ class Pbkdf1_Test(TestCase):
         )
 
     def setUp(self):
-        super(Pbkdf1_Test, self).setUp()
+        super().setUp()
         warnings.filterwarnings("ignore", ".*passlib.utils.pbkdf2.*deprecated", DeprecationWarning)
 
     def test_known(self):
@@ -207,7 +207,7 @@ class Pbkdf2_Test(TestCase):
         ]
 
     def setUp(self):
-        super(Pbkdf2_Test, self).setUp()
+        super().setUp()
         warnings.filterwarnings("ignore", ".*passlib.utils.pbkdf2.*deprecated", DeprecationWarning)
 
     def test_known(self):
diff --git a/passlib/tests/utils.py b/passlib/tests/utils.py
index 1880dd9..d00d30a 100644
--- a/passlib/tests/utils.py
+++ b/passlib/tests/utils.py
@@ -314,7 +314,7 @@ class TestCase(unittest.TestCase):
 
     def shortDescription(self):
         """wrap shortDescription() method to prepend descriptionPrefix"""
-        desc = super(TestCase, self).shortDescription()
+        desc = super().shortDescription()
         prefix = self.descriptionPrefix
         if prefix:
             desc = "%s: %s" % (prefix, desc or str(self))
@@ -347,7 +347,7 @@ class TestCase(unittest.TestCase):
     resetWarningState = True
 
     def setUp(self):
-        super(TestCase, self).setUp()
+        super().setUp()
         self.setUpWarnings()
         # have uh.debug_only_repr() return real values for duration of test
         self.patchAttr(exc, "ENABLE_DEBUG_ONLY_REPR", True)
@@ -389,7 +389,7 @@ class TestCase(unittest.TestCase):
         msg = kwds.pop("__msg__", None)
         if _callable is None:
             # FIXME: this ignores 'msg'
-            return super(TestCase, self).assertRaises(_exc_type, None,
+            return super().assertRaises(_exc_type, None,
                                                       *args, **kwds)
         try:
             result = _callable(*args, **kwds)
@@ -462,14 +462,13 @@ class TestCase(unittest.TestCase):
         def __init__(self, case, **kwds):
             self.case = case
             self.kwds = kwds
-            self.__super = super(TestCase._AssertWarningList, self)
-            self.__super.__init__(record=True)
+            super().__init__(record=True)
 
         def __enter__(self):
-            self.log = self.__super.__enter__()
+            self.log = super().__enter__()
 
         def __exit__(self, *exc_info):
-            self.__super.__exit__(*exc_info)
+            super().__exit__(*exc_info)
             if exc_info[0] is None:
                 self.case.assertWarningList(self.log, **self.kwds)
 
@@ -995,7 +994,7 @@ class HandlerCase(TestCase):
         if test_requires_backend and self._skip_backend_reason:
             raise self.skipTest(self._skip_backend_reason)
 
-        super(HandlerCase, self).setUp()
+        super().setUp()
 
         # if needed, select specific backend for duration of test
         # NOTE: skipping this if create_backend_case() signalled we're skipping backend
@@ -3134,7 +3133,7 @@ class OsCryptMixin(HandlerCase):
         if not self.handler.has_backend("os_crypt"):
             # XXX: currently, any tests that use this are skipped entirely! (see issue 120)
             self._patch_safe_crypt()
-        super(OsCryptMixin, self).setUp()
+        super().setUp()
 
     @classmethod
     def _get_safe_crypt_handler_backend(cls):
@@ -3191,7 +3190,7 @@ class OsCryptMixin(HandlerCase):
         when it's known os_crypt will be faked by _patch_safe_crypt()
         """
         assert backend == "os_crypt"
-        reason = super(OsCryptMixin, cls)._get_skip_backend_reason(backend)
+        reason = super()._get_skip_backend_reason(backend)
 
         from passlib.utils import has_crypt
         if reason == cls._BACKEND_NOT_AVAILABLE and has_crypt:
@@ -3493,13 +3492,13 @@ class reset_warnings(warnings.catch_warnings):
     """catch_warnings() wrapper which clears warning registry & filters"""
 
     def __init__(self, reset_filter="always", reset_registry=".*", **kwds):
-        super(reset_warnings, self).__init__(**kwds)
+        super().__init__(**kwds)
         self._reset_filter = reset_filter
         self._reset_registry = re.compile(reset_registry) if reset_registry else None
 
     def __enter__(self):
         # let parent class archive filter state
-        ret = super(reset_warnings, self).__enter__()
+        ret = super().__enter__()
 
         # reset the filter to list everything
         if self._reset_filter:
@@ -3538,7 +3537,7 @@ class reset_warnings(warnings.catch_warnings):
                         setattr(mod, "__warningregistry__", orig)
                     else:
                         reg.update(orig)
-        super(reset_warnings, self).__exit__(*exc_info)
+        super().__exit__(*exc_info)
 
 #=============================================================================
 # eof