diff options
Diffstat (limited to 'passlib/tests/test_crypto_scrypt.py')
| -rw-r--r-- | passlib/tests/test_crypto_scrypt.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/passlib/tests/test_crypto_scrypt.py b/passlib/tests/test_crypto_scrypt.py index 73ff1fa..5009db0 100644 --- a/passlib/tests/test_crypto_scrypt.py +++ b/passlib/tests/test_crypto_scrypt.py @@ -7,15 +7,16 @@ from binascii import hexlify import hashlib import logging; log = logging.getLogger(__name__) import struct +from unittest import skipUnless import warnings warnings.filterwarnings("ignore", ".*using builtin scrypt backend.*") # site # pkg from passlib import exc from passlib.utils import getrandbytes -from passlib.utils.compat import PYPY, u, bascii_to_str +from passlib.utils.compat import PYPY, bascii_to_str from passlib.utils.decor import classproperty -from passlib.tests.utils import TestCase, skipUnless, TEST_MODE, hb +from passlib.tests.utils import TestCase, TEST_MODE, hb # subject from passlib.crypto import scrypt as scrypt_mod # local @@ -312,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 @@ -450,7 +451,7 @@ class _CommonScryptTest(TestCase): return hexstr(scrypt_mod.scrypt(secret, "salt", 2, 2, 2, 16)) # unicode - TEXT = u("abc\u00defg") + TEXT = u"abc\u00defg" self.assertEqual(run_scrypt(TEXT), '05717106997bfe0da42cf4779a2f8bd8') # utf8 bytes @@ -475,7 +476,7 @@ class _CommonScryptTest(TestCase): return hexstr(scrypt_mod.scrypt("secret", salt, 2, 2, 2, 16)) # unicode - TEXT = u("abc\u00defg") + TEXT = u"abc\u00defg" self.assertEqual(run_scrypt(TEXT), 'a748ec0f4613929e9e5f03d1ab741d88') # utf8 bytes @@ -597,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) |