diff options
author | Robey Pointer <robey@lag.net> | 2005-07-14 02:51:31 +0000 |
---|---|---|
committer | Robey Pointer <robey@lag.net> | 2005-07-14 02:51:31 +0000 |
commit | 37f3775389e2aceabc3ff6ddf4c6c3f47ff04ccc (patch) | |
tree | 8c5fe9640450269dbc38606f7732b602874951ca | |
parent | a321fa026deff83129c9a680f667eaf961d4772c (diff) |
[project @ Arch-1:robey@lag.net--2005-master-shake%paramiko--dev--1--patch-41]
pull in tiny changes from ralph
Patches applied:
* robey@lag.net--2005/paramiko--dev--1--patch-2
merge laptop work
* robey@lag.net--2005/paramiko--dev--1--patch-3
update from laptop
* robey@lag.net--2005/paramiko--dev--1--patch-4
integrate tons more laptop work
* robey@lag.net--2005/paramiko--dev--1--patch-5
thew has a good point: this is stable software now, not alpha
* robey@lag.net--2005/paramiko--dev--1--patch-6
roll up laptop changes
-rw-r--r-- | paramiko/sftp_file.py | 4 | ||||
-rw-r--r-- | setup.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/paramiko/sftp_file.py b/paramiko/sftp_file.py index 36d6772f..51c7d078 100644 --- a/paramiko/sftp_file.py +++ b/paramiko/sftp_file.py @@ -76,7 +76,7 @@ class SFTPFile (BufferedFile): @see: L{Channel.settimeout} @param timeout: seconds to wait for a pending read/write operation - before raising C{socket.timeout}, or C{None} for no timeout + before raising C{socket.timeout}, or C{None} for no timeout @type timeout: float """ self.sftp.sock.settimeout(timeout) @@ -98,7 +98,7 @@ class SFTPFile (BufferedFile): @see: L{Channel.setblocking} @param blocking: 0 to set non-blocking mode; non-0 to set blocking - mode. + mode. @type blocking: int """ self.sftp.sock.setblocking(blocking) @@ -39,7 +39,7 @@ setup(name = "paramiko", download_url = 'http://www.lag.net/paramiko/download/paramiko-1.3.1.zip', license = 'LGPL', platforms = 'Posix; MacOS X; Windows', - classifiers = [ 'Development Status :: 3 - Alpha', + classifiers = [ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', 'Operating System :: OS Independent', |