diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-22 13:58:13 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-22 13:58:13 -0500 |
| commit | a6252cbf211691aa9d81fd535f5af7bcdbbd6620 (patch) | |
| tree | ca1131ba7a8ff0437d392c20a70f17ee7470e3dd /mediagoblin/plugins/basic_auth/tools.py | |
| parent | c47f402d7ee42e88ee1086351010dd598da6c0a5 (diff) | |
| parent | 6430ae97eca57f4db4bcef54436df6c2abcd21ad (diff) | |
| download | mediagoblin-a6252cbf211691aa9d81fd535f5af7bcdbbd6620.tar.lz mediagoblin-a6252cbf211691aa9d81fd535f5af7bcdbbd6620.tar.xz mediagoblin-a6252cbf211691aa9d81fd535f5af7bcdbbd6620.zip | |
Merge branch 'merge-python3-port'
Conflicts:
setup.py
Diffstat (limited to 'mediagoblin/plugins/basic_auth/tools.py')
| -rw-r--r-- | mediagoblin/plugins/basic_auth/tools.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/plugins/basic_auth/tools.py b/mediagoblin/plugins/basic_auth/tools.py index f943bf39..13f240b2 100644 --- a/mediagoblin/plugins/basic_auth/tools.py +++ b/mediagoblin/plugins/basic_auth/tools.py @@ -16,6 +16,8 @@ import bcrypt import random +import six + from mediagoblin import mg_globals from mediagoblin.tools.crypto import get_timed_signer_url from mediagoblin.tools.mail import send_email @@ -66,7 +68,7 @@ def bcrypt_gen_password_hash(raw_pass, extra_salt=None): if extra_salt: raw_pass = u"%s:%s" % (extra_salt, raw_pass) - return unicode( + return six.text_type( bcrypt.hashpw(raw_pass.encode('utf-8'), bcrypt.gensalt())) |