changeset 348:5ff3b1639154

Fix bcrypt callback wrapper: * Use new-style `flask.ext` package. * Correctly encode strings when needed.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 19 Sep 2015 22:01:14 -0700
parents ece930a816b1
children 128df013c9c0
files wikked/bcryptfallback.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/wikked/bcryptfallback.py	Sat Sep 19 10:14:51 2015 -0700
+++ b/wikked/bcryptfallback.py	Sat Sep 19 22:01:14 2015 -0700
@@ -3,19 +3,19 @@
 logger = logging.getLogger(__name__)
 
 try:
-    from flaskext.bcrypt import Bcrypt, generate_password_hash
-
+    from flask.ext.bcrypt import Bcrypt, generate_password_hash
 except ImportError:
     logger.warning("Bcrypt not available... falling back to SHA512.")
-    logger.warning("Run `pip install Flask-Bcrypt` for more secure password hashing.")
+    logger.warning("Run `pip install Flask-Bcrypt` for more secure "
+                   "password hashing.")
 
     import hashlib
 
     def generate_password_hash(password):
-        return hashlib.sha512(password).hexdigest()
+        return hashlib.sha512(password.encode('utf8')).hexdigest()
 
     def check_password_hash(reference, check):
-        check_hash = hashlib.sha512(check).hexdigest()
+        check_hash = hashlib.sha512(check.encode('utf8')).hexdigest()
         return check_hash == reference
 
     class SHA512Fallback(object):