diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-08-28 14:03:18 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-08-28 14:03:18 -0700 |
| commit | 9f1d317b7a9a7c4beb55adaddb50cb19b784e204 (patch) | |
| tree | 18f31ccc98767111859c9b8fb8bede0befa02c2d | |
| parent | 0b63610902c9c608423e246162f050e53576f6a4 (diff) | |
| download | paramiko-9f1d317b7a9a7c4beb55adaddb50cb19b784e204.tar.gz | |
Docstring/TODO tweaks
| -rw-r--r-- | paramiko/client.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/client.py b/paramiko/client.py index 94d69842..22e636a7 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -538,7 +538,7 @@ class SSHClient (ClosingContextManager): """ Try, in order: - - The key passed in, if one was passed in. + - The key(s) passed in, if one was passed in. - Any key we can find through an SSH agent (if allowed). - Any "id_rsa", "id_dsa" or "id_ecdsa" key discoverable in ~/.ssh/ (if allowed). @@ -638,6 +638,7 @@ class SSHClient (ClosingContextManager): "~/%s/id_%s" % (directory, name) ) if os.path.isfile(full_path): + # TODO: only do this append if below did not run keyfiles.append((keytype, full_path)) if os.path.isfile(full_path + '-cert.pub'): keyfiles.append((keytype, full_path + '-cert.pub')) |