diff options
Diffstat (limited to 'passlib/tests/test_crypto_digest.py')
| -rw-r--r-- | passlib/tests/test_crypto_digest.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/passlib/tests/test_crypto_digest.py b/passlib/tests/test_crypto_digest.py index 461d209..66f781c 100644 --- a/passlib/tests/test_crypto_digest.py +++ b/passlib/tests/test_crypto_digest.py @@ -2,17 +2,17 @@ #============================================================================= # imports #============================================================================= -from __future__ import with_statement, division # core from binascii import hexlify import hashlib +from unittest import skipUnless import warnings # site # pkg # module from passlib.exc import UnknownHashError -from passlib.utils.compat import PY3, u, JYTHON -from passlib.tests.utils import TestCase, TEST_MODE, skipUnless, hb +from passlib.utils.compat import JYTHON +from passlib.tests.utils import TestCase, TEST_MODE, hb #============================================================================= # test assorted crypto helpers @@ -56,7 +56,7 @@ class HashInfoTest(TestCase): warnings.filterwarnings("ignore", '.*unsupported hash') # test string types - self.assertEqual(norm_hash_name(u("MD4")), "md4") + self.assertEqual(norm_hash_name(u"MD4"), "md4") self.assertEqual(norm_hash_name(b"MD4"), "md4") self.assertRaises(TypeError, norm_hash_name, None) @@ -497,12 +497,7 @@ class Pbkdf2Test(TestCase): self.assertEqual("hashlib-ssl" in PBKDF2_BACKENDS, has_hashlib_ssl) # check for appropriate builtin - from passlib.utils.compat import PY3 - if PY3: - self.assertIn("builtin-from-bytes", PBKDF2_BACKENDS) - else: - # XXX: only true as long as this is preferred over hexlify - self.assertIn("builtin-unpack", PBKDF2_BACKENDS) + self.assertIn("builtin-from-bytes", PBKDF2_BACKENDS) def test_border(self): """test border cases""" |