[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
This commit is contained in:
Robey Pointer 2005-07-14 02:51:31 +00:00
parent a321fa026d
commit 37f3775389
2 changed files with 3 additions and 3 deletions

View File

@ -76,7 +76,7 @@ class SFTPFile (BufferedFile):
@see: L{Channel.settimeout} @see: L{Channel.settimeout}
@param timeout: seconds to wait for a pending read/write operation @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 @type timeout: float
""" """
self.sftp.sock.settimeout(timeout) self.sftp.sock.settimeout(timeout)
@ -98,7 +98,7 @@ class SFTPFile (BufferedFile):
@see: L{Channel.setblocking} @see: L{Channel.setblocking}
@param blocking: 0 to set non-blocking mode; non-0 to set blocking @param blocking: 0 to set non-blocking mode; non-0 to set blocking
mode. mode.
@type blocking: int @type blocking: int
""" """
self.sftp.sock.setblocking(blocking) self.sftp.sock.setblocking(blocking)

View File

@ -39,7 +39,7 @@ setup(name = "paramiko",
download_url = 'http://www.lag.net/paramiko/download/paramiko-1.3.1.zip', download_url = 'http://www.lag.net/paramiko/download/paramiko-1.3.1.zip',
license = 'LGPL', license = 'LGPL',
platforms = 'Posix; MacOS X; Windows', platforms = 'Posix; MacOS X; Windows',
classifiers = [ 'Development Status :: 3 - Alpha', classifiers = [ 'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
'Operating System :: OS Independent', 'Operating System :: OS Independent',