pkey: remove progress_func from pkey generate() methods

demos/demo_keygen.py

@@ -40,24 +40,8 @@
 }
 
 
-def progress(arg=None):
-    if not arg:
-        sys.stdout.write('0%\x08\x08\x08 ')
-        sys.stdout.flush()
-    elif arg[0] == 'p':
-        sys.stdout.write('25%\x08\x08\x08\x08 ')
-        sys.stdout.flush()
-    elif arg[0] == 'h':
-        sys.stdout.write('50%\x08\x08\x08\x08 ')
-        sys.stdout.flush()
-    elif arg[0] == 'x':
-        sys.stdout.write('75%\x08\x08\x08\x08 ')
-        sys.stdout.flush()
-
-
 if __name__ == '__main__':
     phrase = None
-    pfunc = None
 
     parser = OptionParser(usage=usage)
     parser.add_option("-t", "--type", type="string", dest="ktype",
@@ -96,7 +80,6 @@ def progress(arg=None):
         phrase = getattr(options, 'newphrase')
 
     if options.verbose:
-        pfunc = progress
         sys.stdout.write("Generating priv/pub %s %d bits key pair (%s/%s.pub)..."
                          % (ktype, bits, filename, filename))
         sys.stdout.flush()
@@ -108,7 +91,7 @@ def progress(arg=None):
         raise SSHException("Unknown %s algorithm to generate keys pair" % ktype)
 
     # generating private key
-    prv = key_dispatch_table[ktype].generate(bits=bits, progress_func=pfunc)
+    prv = key_dispatch_table[ktype].generate(bits=bits)
     prv.write_private_key_file(filename, password=phrase)
 
     # generating public key

paramiko/dsskey.py

@@ -195,13 +195,12 @@ def write_private_key(self, file_obj, password=None):
         )
 
     @staticmethod
-    def generate(bits=1024, progress_func=None):
+    def generate(bits=1024):
         """
         Generate a new private DSS key.  This factory function can be used to
         generate a new host key or authentication key.
 
         :param int bits: number of bits the generated key should be.
-        :param progress_func: Unused
         :return: new `.DSSKey` private key
         """
         numbers = dsa.generate_private_key(

paramiko/ecdsakey.py

@@ -243,12 +243,11 @@ def write_private_key(self, file_obj, password=None):
         )
 
     @classmethod
-    def generate(cls, curve=ec.SECP256R1(), progress_func=None, bits=None):
+    def generate(cls, curve=ec.SECP256R1(), bits=None):
         """
         Generate a new private ECDSA key.  This factory function can be used to
         generate a new host key or authentication key.
 
-        :param progress_func: Not used for this type of key.
         :returns: A new private key (`.ECDSAKey`) object
         """
         if bits is not None:

paramiko/rsakey.py

@@ -142,13 +142,12 @@ def write_private_key(self, file_obj, password=None):
         )
 
     @staticmethod
-    def generate(bits, progress_func=None):
+    def generate(bits):
         """
         Generate a new private RSA key.  This factory function can be used to
         generate a new host key or authentication key.
 
         :param int bits: number of bits the generated key should be.
-        :param progress_func: Unused
         :return: new `.RSAKey` private key
         """
         key = rsa.generate_private_key(