fix: crash roundup-admin perftest password without rounds= argument.

If the rounds value is taken from the config file, it doesn't need to
be parsed into an int.

Author: rouilj

CHANGES.txt

@@ -56,6 +56,8 @@ Fixed:
   manually if it is at 2 million. PBKDF2-SHA512 (PBKDF2S5) has been
   available since release 2.3, but it required a manual step to make
   it the default. (John Rouillard)
+- fixed a crash with roundup-admin perftest password when rounds not set
+  on command line. (John Rouillard)
 
 Features:
 

roundup/admin.py

@@ -1633,6 +1633,7 @@ def do_perftest(self, args):
         """
         from roundup.anypy.time_ import perf_counter
 
+        # default rounds from db.config is an int not str
         props = {"rounds": self.db.config.PASSWORD_PBKDF2_DEFAULT_ROUNDS,
                  "scheme": password.Password.default_scheme}
 
@@ -1649,7 +1650,9 @@ def do_perftest(self, args):
         if args[0] == "password":
             try:
                 # convert 10,000,000 or 10.000.000 to 10000000
-                r = int(re.sub('[,.]', '', props['rounds']))
+                r = int(re.sub('[,.]', '', props['rounds'])) \
+                    if  not isinstance(props['rounds'], int) \
+                        else props['rounds']
                 if r < 1000:
                     print(_("Invalid 'rounds'. Must be larger than 999."))
                     return