Merge pull request bread-and-pepper#385 from regisb/master

Fix user creation for utf-8 usernames
interalia-desarrolloweb · Feb 26, 2014 · 602b39c · 602b39c
2 parents bd42445 + e51a3e7
commit 602b39c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/userena/utils.py b/userena/utils.py
@@ -108,9 +108,11 @@ def generate_sha1(string, salt=None):
     """
     if not isinstance(string, (str, unicode)):
         string = str(string)
+    if isinstance(string, unicode):
+        string = string.encode("utf-8")
     if not salt:
         salt = sha_constructor(str(random.random())).hexdigest()[:5]
-    hash = sha_constructor(salt+str(string.encode('utf-8'))).hexdigest()
+    hash = sha_constructor(salt+string).hexdigest()
 
     return (salt, hash)