diff options
Diffstat (limited to 'passlib/handlers/fshp.py')
| -rw-r--r-- | passlib/handlers/fshp.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/passlib/handlers/fshp.py b/passlib/handlers/fshp.py index ecd75b9..8df4845 100644 --- a/passlib/handlers/fshp.py +++ b/passlib/handlers/fshp.py @@ -12,7 +12,7 @@ import logging; log = logging.getLogger(__name__) # pkg from passlib.utils import to_unicode import passlib.utils.handlers as uh -from passlib.utils.compat import bascii_to_str, u, unicode +from passlib.utils.compat import bascii_to_str, u from passlib.crypto.digest import pbkdf1 # local __all__ = [ @@ -91,7 +91,7 @@ class fshp(uh.HasRounds, uh.HasRawSalt, uh.HasRawChecksum, uh.GenericHandler): 3: ("sha512", 64), } _variant_aliases = dict( - [(unicode(k),k) for k in _variant_info] + + [(str(k),k) for k in _variant_info] + [(v[0],k) for k,v in _variant_info.items()] ) @@ -130,7 +130,7 @@ class fshp(uh.HasRounds, uh.HasRawSalt, uh.HasRawChecksum, uh.GenericHandler): def _norm_variant(cls, variant): if isinstance(variant, bytes): variant = variant.decode("ascii") - if isinstance(variant, unicode): + if isinstance(variant, str): try: variant = cls._variant_aliases[variant] except KeyError: @@ -191,7 +191,7 @@ class fshp(uh.HasRounds, uh.HasRawSalt, uh.HasRawChecksum, uh.GenericHandler): #=================================================================== def _calc_checksum(self, secret): - if isinstance(secret, unicode): + if isinstance(secret, str): secret = secret.encode("utf-8") # NOTE: for some reason, FSHP uses pbkdf1 with password & salt reversed. # this has only a minimal impact on security, |