pbkdf2 handlers now py3 compat

2 files changed, 14 insertions, 4 deletions

diff --git a/passlib/utils/__init__.py b/passlib/utils/__init__.py
index e444383..ab5826b 100644
--- a/passlib/utils/__init__.py
+++ b/passlib/utils/__init__.py
@@ -498,6 +498,10 @@ def xor_bytes(left, right):
 #=================================================================================
 #alt base64 encoding
 #=================================================================================
+_A64_ALTCHARS = b("./")
+_A64_STRIP = b("=\n")
+_A64_PAD1 = b("=")
+_A64_PAD2 = b("==")
 
 def adapted_b64_encode(data):
     """encode using variant of base64
@@ -508,7 +512,7 @@ def adapted_b64_encode(data):
 
     it is primarily used for by passlib's custom pbkdf2 hashes.
     """
-    return b64encode(data, "./").strip("=\n")
+    return b64encode(data, _A64_ALTCHARS).strip(_A64_STRIP)
 
 def adapted_b64_decode(data, sixthree="."):
     """decode using variant of base64
@@ -521,13 +525,13 @@ def adapted_b64_decode(data, sixthree="."):
     """
     off = len(data) % 4
     if off == 0:
-        return b64decode(data, "./")
+        return b64decode(data, _A64_ALTCHARS)
     elif off == 1:
         raise ValueError("invalid bas64 input")
     elif off == 2:
-        return b64decode(data + "==", "./")
+        return b64decode(data + _A64_PAD2, _A64_ALTCHARS)
     else:
-        return b64decode(data + "=", "./")
+        return b64decode(data + _A64_PAD1, _A64_ALTCHARS)
 
 #=================================================================================
 #randomness
diff --git a/passlib/utils/handlers.py b/passlib/utils/handlers.py
index b06a9eb..c15deb6 100644
--- a/passlib/utils/handlers.py
+++ b/passlib/utils/handlers.py
@@ -366,6 +366,12 @@ class GenericHandler(object):
             should return native string type (ascii-bytes under python 2,
             unicode under python 3)
         """
+        #NOTE: documenting some non-standardized but common kwd flags
+        #      that passlib to_string() method may have
+        #
+        #      native=True -- if false, return unicode under py2 -- ignored under py3
+        #      withchk=True -- if false, omit checksum portion of hash
+        #
         raise NotImplementedError("%s must implement from_string()" % (type(self),))
 
     ##def to_config_string(self):