aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-04-03 13:33:45 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-04-03 13:33:45 -0500
commite0bc23d3700cd37926e0d95057d7cd2daab69d78 (patch)
tree38fbce01a3c6371be08aeb4bea590c49b1724660 /mediagoblin
parent73a6e206e679b707ba6b0e138b74e96b94da75f4 (diff)
downloadmediagoblin-e0bc23d3700cd37926e0d95057d7cd2daab69d78.tar.lz
mediagoblin-e0bc23d3700cd37926e0d95057d7cd2daab69d78.tar.xz
mediagoblin-e0bc23d3700cd37926e0d95057d7cd2daab69d78.zip
We should return a unicode object in bcrypt_gen_password_hash
Diffstat (limited to 'mediagoblin')
-rw-r--r--mediagoblin/auth/lib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index 29b955a0..8de67d14 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -63,4 +63,4 @@ def bcrypt_gen_password_hash(raw_pass, extra_salt=None):
if extra_salt:
raw_pass = u"%s:%s" % (extra_salt, raw_pass)
- return bcrypt.hashpw(raw_pass, bcrypt.gensalt())
+ return unicode(bcrypt.hashpw(raw_pass, bcrypt.gensalt()))