diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2020-10-06 12:19:45 -0400 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2020-10-06 12:19:45 -0400 |
| commit | db09b6032eadf839844e2275c163d33f744bf255 (patch) | |
| tree | 76729842006074843b4a110ae24b1250f7c9076d | |
| parent | 0a25f664189515086d12aabacc0275b6b2ba209a (diff) | |
| download | passlib-db09b6032eadf839844e2275c163d33f744bf255.tar.gz | |
minor cleanups after merge -- removed some stray u() calls
| -rw-r--r-- | passlib/handlers/ldap_digests.py | 4 | ||||
| -rw-r--r-- | passlib/tests/test_handlers.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/passlib/handlers/ldap_digests.py b/passlib/handlers/ldap_digests.py index 8208c12..b0e6589 100644 --- a/passlib/handlers/ldap_digests.py +++ b/passlib/handlers/ldap_digests.py @@ -237,7 +237,7 @@ class ldap_salted_sha256(_SaltedBase64DigestHelper): .. versionadded:: 1.7.3 """ name = "ldap_salted_sha256" - ident = u("{SSHA256}") + ident = u"{SSHA256}" checksum_size = 32 default_salt_size = 8 _hash_func = sha256 @@ -277,7 +277,7 @@ class ldap_salted_sha512(_SaltedBase64DigestHelper): .. versionadded:: 1.7.3 """ name = "ldap_salted_sha512" - ident = u("{SSHA512}") + ident = u"{SSHA512}" checksum_size = 64 default_salt_size = 8 _hash_func = sha512 diff --git a/passlib/tests/test_handlers.py b/passlib/tests/test_handlers.py index c8f9c1e..4f6541c 100644 --- a/passlib/tests/test_handlers.py +++ b/passlib/tests/test_handlers.py @@ -585,7 +585,7 @@ class ldap_salted_sha256_test(HandlerCase): ("password", '{SSHA256}x1tymSTVjozxQ2PtT46ysrzhZxbcskK0o2f8hEFx7fAQQmhtDSEkJA=='), ("test", '{SSHA256}xfqc9aOR6z15YaEk3/Ufd7UL9+JozB/1EPmCDTizL0GkdA7BuNda6w=='), ("toomanysecrets", '{SSHA256}RrTKrg6HFXcjJ+eDAq4UtbODxOr9RLeG+I69FoJvutcbY0zpfU+p1Q=='), - (u('letm\xe8\xefn'), '{SSHA256}km7UjUTBZN8a+gf1ND2/qn15N7LsO/jmGYJXvyTfJKAbI0RoLWWslQ=='), + (u'letm\xe8\xefn', '{SSHA256}km7UjUTBZN8a+gf1ND2/qn15N7LsO/jmGYJXvyTfJKAbI0RoLWWslQ=='), # alternate salt sizes (4, 15, 16) # generated locally @@ -612,7 +612,7 @@ class ldap_salted_sha512_test(HandlerCase): # generated by testing ldap server web interface (see issue 124 comments) # salt size = 8 ("toomanysecrets", '{SSHA512}wExp4xjiCHS0zidJDC4UJq9EEeIebAQPJ1PWSwfhxWjfutI9XiiKuHm2AE41cEFfK+8HyI8bh+ztbczUGsvVFIgICWWPt7qu'), - (u('letm\xe8\xefn'), '{SSHA512}mpNUSmZc3TNx+RnPwkIAVMf7ocEKLPrIoQNsg4Eu8dHvyCeb2xzHp5A6n4tF7ntknSvfvRZaJII4ImvNJlYsgiwAm0FMqR+3'), + (u'letm\xe8\xefn', '{SSHA512}mpNUSmZc3TNx+RnPwkIAVMf7ocEKLPrIoQNsg4Eu8dHvyCeb2xzHp5A6n4tF7ntknSvfvRZaJII4ImvNJlYsgiwAm0FMqR+3'), # generated locally # salt size = 8 |