summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrews Medina <andrewsmedina@gmail.com>2012-08-11 00:18:33 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-11 00:20:59 +0200
commit87e0a75c03747c5b7ed87311c2e1f34d9fb20bee (patch)
tree283609bddc3fc434de227478183bdf97f29da54a
parentcb38fd9632f314bd78324083005dc8df55200390 (diff)
[py3] Decoded base64-encoded hash in contrib.auth.hashers
-rw-r--r--django/contrib/auth/hashers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
index 45c1f88ab2..cdaf75636f 100644
--- a/django/contrib/auth/hashers.py
+++ b/django/contrib/auth/hashers.py
@@ -219,7 +219,7 @@ class PBKDF2PasswordHasher(BasePasswordHasher):
if not iterations:
iterations = self.iterations
hash = pbkdf2(password, salt, iterations, digest=self.digest)
- hash = base64.b64encode(hash).strip()
+ hash = base64.b64encode(hash).decode('ascii').strip()
return "%s$%d$%s$%s" % (self.algorithm, iterations, salt, hash)
def verify(self, password, encoded):