cleanup old python compat -- replaced "unicode" alias in favor of "str"

1 files changed, 5 insertions, 5 deletions

diff --git a/passlib/tests/test_utils_handlers.py b/passlib/tests/test_utils_handlers.py
index 0a98978..8527304 100644
--- a/passlib/tests/test_utils_handlers.py
+++ b/passlib/tests/test_utils_handlers.py
@@ -12,7 +12,7 @@ import warnings
 from passlib.hash import ldap_md5, sha256_crypt
 from passlib.exc import MissingBackendError, PasslibHashWarning
 from passlib.utils.compat import str_to_uascii, \
-                                 uascii_to_str, unicode
+                                 uascii_to_str
 import passlib.utils.handlers as uh
 from passlib.tests.utils import HandlerCase, TestCase
 # module
@@ -155,7 +155,7 @@ class SkeletonTest(TestCase):
 
         # relaxed
         # NOTE: this could be turned back on if we test _norm_checksum() directly...
-        #with self.assertWarningList("checksum should be unicode"):
+        #with self.assertWarningList("checksum should be str"):
         #    self.assertEqual(norm_checksum(b'xxzx', relaxed=True), u'xxzx')
         #self.assertRaises(TypeError, norm_checksum, 1, relaxed=True)
 
@@ -174,7 +174,7 @@ class SkeletonTest(TestCase):
         # test bytes
         self.assertEqual(norm_checksum(b'1234'), b'1234')
 
-        # test unicode
+        # test str
         self.assertRaises(TypeError, norm_checksum, u'xxyx')
 
         # NOTE: this could be turned back on if we test _norm_checksum() directly...
@@ -746,7 +746,7 @@ class UnsaltedHash(uh.StaticHandler):
     checksum_size = 40
 
     def _calc_checksum(self, secret):
-        if isinstance(secret, unicode):
+        if isinstance(secret, str):
             secret = secret.encode("utf-8")
         data = b"boblious" + secret
         return str_to_uascii(hashlib.sha1(data).hexdigest())
@@ -776,7 +776,7 @@ class SaltedHash(uh.HasSalt, uh.GenericHandler):
         return uascii_to_str(hash)
 
     def _calc_checksum(self, secret):
-        if isinstance(secret, unicode):
+        if isinstance(secret, str):
             secret = secret.encode("utf-8")
         data = self.salt.encode("ascii") + secret + self.salt.encode("ascii")
         return str_to_uascii(hashlib.sha1(data).hexdigest())