[project @ Arch-1:robey@lag.net--2005-master-shake%paramiko--dev--1--patch-20]

fix docs and update version to 1.3.1

Makefile

@@ -12,6 +12,7 @@
 # kabuto (12dec04) - 1.1
 # lapras (28feb05) - 1.2
 # marowak (9apr05) - 1.3
+# nidoran (28jun05) - 1.3.1
 
 release:
 	python ./setup.py sdist --formats=zip

README

@@ -133,7 +133,7 @@ the best and easiest examples of how to use the SFTP class.
 
 highlights of what's new in each release:
 
-v1.3.1
+v1.3.1 NIDORAN
 * added SFTPClient.close()
 * fixed up some outdated documentation
 * made SFTPClient.file() an alias for open()
@@ -141,6 +141,8 @@ v1.3.1
 * refactored packetizing out of Transport
 * fixed bug (reported by alain s.) where connecting to a non-SSH host could
   cause paramiko to freeze up
+* fixed Channel.fileno() for Windows (again)
+* some more unit tests
 
 v1.3 MAROWAK
 * fixed a bug where packets larger than about 12KB would cause the session

paramiko/__init__.py

@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 # Copyright (C) 2003-2005 Robey Pointer <robey@lag.net>
 #
 # This file is part of paramiko.
@@ -48,7 +46,7 @@ released under the GNU Lesser General Public License (LGPL).
 
 Website: U{http://www.lag.net/paramiko/}
 
-@version: 1.3 (marowak)
+@version: 1.3.1 (marowak)
 @author: Robey Pointer
 @contact: robey@lag.net
 @license: GNU Lesser General Public License (LGPL)
@@ -61,8 +59,8 @@ if sys.version_info < (2, 2):
 
 
 __author__ = "Robey Pointer <robey@lag.net>"
-__date__ = "9 Apr 2005"
-__version__ = "1.3 (marowak)"
+__date__ = "28 Jun 2005"
+__version__ = "1.3.1 (nidoran)"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 

paramiko/channel.py

@@ -1096,7 +1096,7 @@ class Channel (object):
         an actual OS-level "WinSock", because on Windows, only a "WinSock" may be
         selected on.  Sigh.
     
-        @return (read_end, write_end) tuple
+        @return: (read_end, write_end) tuple
         """
         if sys.platform[:3] != 'win':
             return os.pipe()

paramiko/packet.py

@@ -166,7 +166,7 @@ class Packetizer (object):
         @type n: int
         @return: the data read
         @rtype: str
-        @throw EOFError: if the socket was closed before all the bytes could
+        @raise EOFError: if the socket was closed before all the bytes could
             be read
         """
         if PY22:
@@ -263,7 +263,7 @@ class Packetizer (object):
         Only one thread should ever be in this function (no other locking is
         done).
         
-        @throw SSHException: if the packet is mangled
+        @raise SSHException: if the packet is mangled
         """
         header = self.read_all(self.__block_size_in)
         if self.__block_engine_in != None:

paramiko/transport.py

@@ -130,7 +130,7 @@ class BaseTransport (threading.Thread):
     is done here.
     """
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.3'
+    _CLIENT_ID = 'paramiko_1.3.1'
 
     _preferred_ciphers = ( 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc' )
     _preferred_macs = ( 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96' )

setup.py

@@ -30,13 +30,13 @@ Required packages:
 '''
 
 setup(name = "paramiko",
-      version = "1.3",
+      version = "1.3.1",
       description = "SSH2 protocol library",
       author = "Robey Pointer",
       author_email = "robey@lag.net",
       url = "http://www.lag.net/paramiko/",
       packages = [ 'paramiko' ],
-      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.3.zip',
+      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',