summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2012-09-25 18:09:35 -0700
committerJeff Forcier <jeff@bitprophet.org>2012-09-25 18:09:35 -0700
commit2e016358ef0a56df23b798196657ba9d6f7520c6 (patch)
treeb8fdd7afd2f331b2f1324fda70984f1eddfcbd82
parent30a2d14b78385cd3097da9a7953392143a1e6f55 (diff)
downloadparamiko-2e016358ef0a56df23b798196657ba9d6f7520c6.tar.gz
Whitespace + lang tweak
-rw-r--r--paramiko/client.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/paramiko/client.py b/paramiko/client.py
index 94bc479a..0f408977 100644
--- a/paramiko/client.py
+++ b/paramiko/client.py
@@ -419,9 +419,8 @@ class SSHClient (object):
- Any "id_rsa" or "id_dsa" key discoverable in ~/.ssh/ (if allowed).
- Plain username/password auth, if a password was given.
- (The password might be needed to unlock a private key.)
-
- The password is required for two-factor authentication.
+ (The password might be needed to unlock a private key, or for
+ two-factor authentication [for which it is required].)
"""
saved_exception = None
two_factor = False
@@ -482,10 +481,10 @@ class SSHClient (object):
keyfiles.append((RSAKey, rsa_key))
if os.path.isfile(dsa_key):
keyfiles.append((DSSKey, dsa_key))
-
+
if not look_for_keys:
keyfiles = []
-
+
for pkey_class, filename in keyfiles:
try:
key = pkey_class.from_private_key_file(filename, password)