Skip to content
Browse files

Merge branch '1.5'

  • Loading branch information...
2 parents 246b0cf + 4daad29 commit d01ca02264b632232f375a2a9bfb96bd382a9828 @bitprophet bitprophet committed Dec 15, 2012
Showing with 12 additions and 12 deletions.
  1. +5 −5 docs/installation.rst
  2. +5 −5 docs/usage/ssh.rst
  3. +1 −1 fabric/decorators.py
  4. +1 −1 fabric/network.py
View
10 docs/installation.rst
@@ -31,8 +31,8 @@ In order for Fabric's installation to succeed, you will need four primary pieces
* the Python programming language;
* the ``setuptools`` packaging/installation library;
-* the Python ``ssh`` SSH2 library;
-* and ``ssh``'s dependency, the PyCrypto cryptography library.
+* the Python ``paramiko`` SSH2 library;
+* and ``paramiko``'s dependency, the PyCrypto cryptography library.
and, if using the :doc:`parallel execution mode </usage/parallel>`:
@@ -234,11 +234,11 @@ installation of Fabric via ``pypm``::
C:\> pypm install fabric
The following packages will be installed into "%APPDATA%\Python" (2.7):
- ssh-1.7.8 pycrypto-2.4 fabric-1.3.0
+ paramiko-1.7.8 pycrypto-2.4 fabric-1.3.0
Get: [pypm-free.activestate.com] fabric 1.3.0
- Get: [pypm-free.activestate.com] ssh 1.7.8
+ Get: [pypm-free.activestate.com] paramiko 1.7.8
Get: [pypm-free.activestate.com] pycrypto 2.4
- Installing ssh-1.7.8
+ Installing paramiko-1.7.8
Installing pycrypto-2.4
Installing fabric-1.3.0
Fixing script %APPDATA%\Python\Scripts\fab-script.py
View
10 docs/usage/ssh.rst
@@ -18,8 +18,8 @@ identifiers (IP address, sometimes with a hostname as well) and SSH keys. (For
details on how this works, please see the `OpenSSH documentation
<http://openssh.org/manual.html>`_.)
-The ``ssh`` library is capable of loading up your ``known_hosts`` file, and
-will then compare any host it connects to, with that mapping. Settings are
+The ``paramiko`` library is capable of loading up your ``known_hosts`` file,
+and will then compare any host it connects to, with that mapping. Settings are
available to determine what happens when an unknown host (a host whose username
or IP is not found in ``known_hosts``) is seen:
@@ -29,9 +29,9 @@ or IP is not found in ``known_hosts``) is seen:
* **Add**: the new host key is added to the in-memory list of known hosts, the
connection is made, and things continue normally. Note that this does **not**
modify your on-disk ``known_hosts`` file!
-* **Ask**: not yet implemented at the Fabric level, this is an ``ssh`` library
- option which would result in the user being prompted about the unknown key
- and whether to accept it.
+* **Ask**: not yet implemented at the Fabric level, this is a ``paramiko``
+ library option which would result in the user being prompted about the
+ unknown key and whether to accept it.
Whether to reject or add hosts, as above, is controlled in Fabric via the
:ref:`env.reject_unknown_hosts <reject-unknown-hosts>` option, which is False
View
2 fabric/decorators.py
@@ -170,7 +170,7 @@ def real_decorator(func):
def inner(*args, **kwargs):
# Required for ssh/PyCrypto to be happy in multiprocessing
# (as far as we can tell, this is needed even with the extra such
- # calls in newer versions of the 'ssh' library.)
+ # calls in newer versions of paramiko.)
Random.atfork()
return func(*args, **kwargs)
inner.parallel = True
View
2 fabric/network.py
@@ -382,7 +382,7 @@ def connect(user, host, port, sock=None):
# Otherwise, assume an auth exception, and prompt for new/better
# password.
- # The 'ssh' library doesn't handle prompting for locked private
+ # Paramiko doesn't handle prompting for locked private
# keys (i.e. keys with a passphrase and not loaded into an agent)
# so we have to detect this and tweak our prompt slightly.
# (Otherwise, however, the logic flow is the same, because

0 comments on commit d01ca02

Please sign in to comment.
Something went wrong with that request. Please try again.