James Mills avatar James Mills committed 9e859b1

Improved mkpasswd(...) function

Comments (0)

Files changed (1)

 import string
 from time import time
 from os.path import isfile
-from random import seed, choice
+from itertools import chain
+from random import seed, choice, shuffle
 
 
 class Error(Exception):
 
     seed(time())
 
-    charset = string.ascii_letters + string.digits
-    charset = charset.strip("oO0")
+    letters = string.letters.strip("oO")
 
-    password = ""
+    password = list(
+        chain(
+            (choice(string.digits) for _ in range(digits)),
+            (choice(string.uppercase) for _ in range(upper)),
+            (choice(string.lowercase) for _ in range(lower)),
+            (choice(letters) for _ in range((length - digits - upper - lower)))
+        )
+    )
 
-    while True:
-        password = "".join(choice(charset) for i in range(length))
+    shuffle(password)
 
-        if len([x for x in password if x.isupper()]) < upper:
-            continue
-        elif len([x for x in password if x.islower()]) < lower:
-            continue
-        elif len([x for x in password if x.isdigit()]) < digits:
-            continue
-        else:
-            break
-
-    return password
+    return "".join(password)
 
 
 def validateEmail(email):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.