Skip to content

Commit

Permalink
[project @ Arch-1:[email protected]%paramiko--dev--1--…
Browse files Browse the repository at this point in the history
…patch-41]

pull in tiny changes from ralph
Patches applied:

 * [email protected]/paramiko--dev--1--patch-2
   merge laptop work

 * [email protected]/paramiko--dev--1--patch-3
   update from laptop

 * [email protected]/paramiko--dev--1--patch-4
   integrate tons more laptop work

 * [email protected]/paramiko--dev--1--patch-5
   thew has a good point: this is stable software now, not alpha

 * [email protected]/paramiko--dev--1--patch-6
   roll up laptop changes
  • Loading branch information
Robey Pointer committed Jul 14, 2005
1 parent a321fa0 commit 37f3775
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions paramiko/sftp_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def settimeout(self, timeout):
@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)
Expand All @@ -98,7 +98,7 @@ def setblocking(self, blocking):
@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)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
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',
Expand Down

0 comments on commit 37f3775

Please sign in to comment.