Merge branch '1.8' into 1.9

This commit is contained in:
Jeff Forcier 2013-02-03 11:52:30 -08:00
commit 6284666cfd
2 changed files with 5 additions and 19 deletions

18
README
View File

@ -20,7 +20,7 @@ What
---- ----
"paramiko" is a combination of the esperanto words for "paranoid" and "paramiko" is a combination of the esperanto words for "paranoid" and
"friend". it's a module for python 2.2+ that implements the SSH2 protocol "friend". it's a module for python 2.5+ that implements the SSH2 protocol
for secure (encrypted and authenticated) connections to remote machines. for secure (encrypted and authenticated) connections to remote machines.
unlike SSL (aka TLS), SSH2 protocol does not require hierarchical unlike SSL (aka TLS), SSH2 protocol does not require hierarchical
certificates signed by a powerful central authority. you may know SSH2 as certificates signed by a powerful central authority. you may know SSH2 as
@ -39,8 +39,7 @@ that should have come with this archive.
Requirements Requirements
------------ ------------
- python 2.3 or better <http://www.python.org/> - python 2.5 or better <http://www.python.org/>
(python 2.2 is also supported, but not recommended)
- pycrypto 2.1 or better <https://www.dlitz.net/software/pycrypto/> - pycrypto 2.1 or better <https://www.dlitz.net/software/pycrypto/>
If you have setuptools, you can build and install paramiko and all its If you have setuptools, you can build and install paramiko and all its
@ -58,19 +57,6 @@ should also work on Windows, though i don't test it as frequently there.
if you run into Windows problems, send me a patch: portability is important if you run into Windows problems, send me a patch: portability is important
to me. to me.
python 2.2 may work, thanks to some patches from Roger Binns. things to
watch out for:
* sockets in 2.2 don't support timeouts, so the 'select' module is
imported to do polling.
* logging is mostly stubbed out. it works just enough to let paramiko
create log files for debugging, if you want them. to get real logging,
you can backport python 2.3's logging package. Roger has done that
already:
http://sourceforge.net/project/showfiles.php?group_id=75211&package_id=113804
you really should upgrade to python 2.3. laziness is no excuse! :)
some python distributions don't include the utf-8 string encodings, for some python distributions don't include the utf-8 string encodings, for
reasons of space (misdirected as that is). if your distribution is reasons of space (misdirected as that is). if your distribution is
missing encodings, you'll see an error like this:: missing encodings, you'll see an error like this::

View File

@ -18,7 +18,7 @@
""" """
I{Paramiko} (a combination of the esperanto words for "paranoid" and "friend") I{Paramiko} (a combination of the esperanto words for "paranoid" and "friend")
is a module for python 2.3 or greater that implements the SSH2 protocol for is a module for python 2.5 or greater that implements the SSH2 protocol for
secure (encrypted and authenticated) connections to remote machines. Unlike secure (encrypted and authenticated) connections to remote machines. Unlike
SSL (aka TLS), the SSH2 protocol does not require hierarchical certificates SSL (aka TLS), the SSH2 protocol does not require hierarchical certificates
signed by a powerful central authority. You may know SSH2 as the protocol that signed by a powerful central authority. You may know SSH2 as the protocol that
@ -50,8 +50,8 @@ Website: U{https://github.com/paramiko/paramiko/}
import sys import sys
if sys.version_info < (2, 2): if sys.version_info < (2, 5):
raise RuntimeError('You need python 2.2 for this module.') raise RuntimeError('You need python 2.5+ for this module.')
__author__ = "Jeff Forcier <jeff@bitprophet.org>" __author__ = "Jeff Forcier <jeff@bitprophet.org>"