Mercurial > p > roundup > code
diff roundup/password.py @ 5416:56c9bcdea47f
Python 3 preparation: unicode.
This patch introduces roundup/anypy/strings.py, which has a comment
explaining the string representations generally used and common
functions to handle the required conversions. Places in the code that
explicitly reference the "unicode" type / built-in function are
generally changed to use the new functions (or, in a few places where
those new functions don't seem to fit well, other approaches such as
references to type(u'') or use of the codecs module). This patch does
not generally attempt to address text conversions in any places not
currently referencing the "unicode" type (although
scripts/import_sf.py is made to use binary I/O in places as fixing the
"unicode" reference didn't seem coherent otherwise).
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Wed, 25 Jul 2018 09:05:58 +0000 |
| parents | 2d6a92c3e212 |
| children | 1f1899658115 |
line wrap: on
line diff
--- a/roundup/password.py Wed Jul 25 00:40:26 2018 +0000 +++ b/roundup/password.py Wed Jul 25 09:05:58 2018 +0000 @@ -24,6 +24,8 @@ from base64 import b64encode, b64decode from hashlib import md5, sha1 +from roundup.anypy.strings import us2s, s2b + try: import crypt except ImportError: @@ -105,10 +107,8 @@ :returns: raw bytes of generated key """ - if isinstance(password, unicode): - password = password.encode("utf-8") - if isinstance(salt, unicode): - salt = salt.encode("utf-8") + password = s2b(us2s(password)) + salt = s2b(us2s(salt)) if keylen > 40: #NOTE: pbkdf2 allows up to (2**31-1)*20 bytes, # but m2crypto has issues on some platforms above 40, @@ -126,8 +126,7 @@ """ unpack pbkdf2 encrypted password into parts, assume it has format "{rounds}${salt}${digest} """ - if isinstance(pbkdf2, unicode): - pbkdf2 = pbkdf2.encode("ascii") + pbkdf2 = us2s(pbkdf2) try: rounds, salt, digest = pbkdf2.split("$") except ValueError: