Skip to content

Commit

Permalink
Formatting tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
bitprophet committed Sep 5, 2014
1 parent 1a16242 commit dc9de3f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions paramiko/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ def connect(self, hostname, port=SSH_PORT, username=None, password=None, pkey=No
- The ``pkey`` or ``key_filename`` passed in (if any)
- Any key we can find through an SSH agent
- Any "id_rsa" or "id_dsa" key discoverable in ``~/.ssh/``
- Any "id_rsa", "id_dsa" or "id_ecdsa" key discoverable in
``~/.ssh/``
- Plain username/password auth, if a password was given
If a private key requires a password to unlock it, and a password is
Expand Down Expand Up @@ -361,7 +362,8 @@ def _auth(self, username, password, pkey, key_filenames, allow_agent, look_for_k
- The key passed in, if one was passed in.
- Any key we can find through an SSH agent (if allowed).
- Any "id_rsa" or "id_dsa" key discoverable in ~/.ssh/ (if allowed).
- Any "id_rsa", "id_dsa" or "id_ecdsa" 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, or for
Expand Down

0 comments on commit dc9de3f

Please sign in to comment.