From 37f3775389e2aceabc3ff6ddf4c6c3f47ff04ccc Mon Sep 17 00:00:00 2001 From: Robey Pointer Date: Thu, 14 Jul 2005 02:51:31 +0000 Subject: [PATCH] [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 --- paramiko/sftp_file.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/paramiko/sftp_file.py b/paramiko/sftp_file.py index 36d6772..51c7d07 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) diff --git a/setup.py b/setup.py index a6ce728..89d43bd 100644 --- a/setup.py +++ b/setup.py @@ -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',