Merge branch 'master' into Develop

4 years ago · 3ff3431b17
parent c6c9cfea22 8608ff11f7
commit 3ff3431b17
1 changed files with 4 additions and 1 deletions
--- a/cps/helper.py
+++ b/cps/helper.py
@ -466,7 +466,10 @@ def reset_password(user_id):
 def generate_random_password():
    s = "abcdefghijklmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%&*()?"
    passlen = 8
-    return "".join(s[c % len(s)] for c in os.urandom(passlen))
+    if sys.version_info < (3, 0):
+        return "".join(s[ord(c) % len(s)] for c in os.urandom(passlen))
+    else:
+        return "".join(s[c % len(s)] for c in os.urandom(passlen))


 def uniq(input):