dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Whitespace + lang tweak

This commit is contained in:
Jeff Forcier 2012-09-25 18:09:35 -07:00
parent 30a2d14b78
commit 2e016358ef
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
paramiko/client.py
View File

@ -419,9 +419,8 @@ class SSHClient (object):
- Any "id_rsa" or "id_dsa" key discoverable in ~/.ssh/ (if allowed). - Any "id_rsa" or "id_dsa" key discoverable in ~/.ssh/ (if allowed).
- Plain username/password auth, if a password was given. - Plain username/password auth, if a password was given.
(The password might be needed to unlock a private key.) (The password might be needed to unlock a private key, or for
two-factor authentication [for which it is required].)
The password is required for two-factor authentication.
""" """
saved_exception = None saved_exception = None
two_factor = False two_factor = False
@ -482,10 +481,10 @@ class SSHClient (object):
keyfiles.append((RSAKey, rsa_key)) keyfiles.append((RSAKey, rsa_key))
if os.path.isfile(dsa_key): if os.path.isfile(dsa_key):
keyfiles.append((DSSKey, dsa_key)) keyfiles.append((DSSKey, dsa_key))
if not look_for_keys: if not look_for_keys:
keyfiles = [] keyfiles = []
for pkey_class, filename in keyfiles: for pkey_class, filename in keyfiles:
try: try:
key = pkey_class.from_private_key_file(filename, password) key = pkey_class.from_private_key_file(filename, password)