- changed initdb again

Miguel Barão
1 parent 305612ce
Showing 1 changed file with 7 additions and 8 deletions Show diff stats
initdb.py
@@ -50,7 +50,7 @@ def parse_commandline_arguments():
         help='users to update')
     argparser.add_argument('--pw',
-        default='',
+        default=None,
         type=str,
         help='set password for new and updated users')
@@ -81,9 +81,9 @@ def get_students_from_csv(filename):
 # ===========================================================================
 # replace password by hash for a single student
-def hashpw(student):
+def hashpw(student, pw=None):
     print('.', end='', flush=True)
-    pw = student.get('pw', student['uid']).encode('utf-8')
+    pw = (pw or student.get('pw', None) or student['uid']).encode('utf-8')
     student['pw'] = bcrypt.hashpw(pw, bcrypt.gensalt())
@@ -150,12 +150,11 @@ if __name__==&#39;__main__&#39;:
     # --- password hashing
     if students:
         print(f'Generating password hashes (bcrypt).')
-        if args.pw:  # maybe set default password
-            for s in students:
-                s['pw'] = args.pw
-
+        hash_func = lambda s: hashpw(s, args.pw)
         with ThreadPoolExecutor() as executor:
-            executor.map(hashpw, students)
+            executor.map(hash_func, students)  # hashing in parallel
+
+        print()
     # --- database stuff
     print(f'Using database: ', args.db)