[project @ robey@lag.net-20051204092822-69155fa5abbc4637]

bump version to 1.5.2

5 files changed, 23 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 3ff0ba58..41b7c23b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@
 # oddish (17jul05) - 1.4
 # paras (2oct05) - 1.5
 # quilava (31oct05) - 1.5.1
+# rhydon (04dec05) - 1.5.2
 
 release:
 	python ./setup.py sdist --formats=zip
diff --git a/README b/README
index c3c20023..45997acc 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-paramiko 1.5.1
-"quilava" release, 31 oct 2005
+paramiko 1.5.2
+"rhydon" release, 04 dec 2005
 
 Copyright (c) 2003-2005 Robey Pointer <robey@lag.net>
 
@@ -134,6 +134,17 @@ the best and easiest examples of how to use the SFTP class.
 
 highlights of what's new in each release:
 
+v1.5.2 RHYDON
+* compression support (opt-in via Transport.use_compression)
+* sftp files may be opened with mode flag 'x' for O_EXCL (exclusive-open)
+  behavior, which has no direct python equivalent
+* added experimental util functions for parsing openssh config files
+* fixed a few bugs (and potential deadlocks) with key renegotiation
+* fixed a bug that caused SFTPFile.prefetch to occasionally lock up
+* fixed an sftp bug which affected van dyke sftp servers
+* fixed the behavior of select()ing on a closed channel, such that it will
+  always trigger as readable
+
 v1.5.1 QUILAVA
 * SFTPFile.prefetch() added to dramatically speed up downloads (automatically
   turned on in SFTPClient.get())
@@ -222,10 +233,6 @@ v1.0 JIGGLYPUFF
 
 ***  MISSING LINKS
 
-R-blockers:
-* unit tests for compression
-* zlib@openssh.com compression probably doesn't work after rekey
-
 * host-based auth (yuck!)
 * SFTP implicit file locking?
 * ChannelException like the java version has
@@ -237,4 +244,5 @@ R-blockers:
 * make a simple example demonstrating use of SocketServer (besides forward.py?)
 
 * make a function to parse .ssh/config files:
-	User, Hostname, Port, ProxyCommand, IdentityFile
+	User, Hostname, Port, ProxyCommand, IdentityFile, HostKeyAlias
+	ProxyCommand: %h = host, %p = port, "none" = disable
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 36a8264d..0a312cbb 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -46,7 +46,7 @@ released under the GNU Lesser General Public License (LGPL).
 
 Website: U{http://www.lag.net/paramiko/}
 
-@version: 1.5.1 (quilava)
+@version: 1.5.2 (rhydon)
 @author: Robey Pointer
 @contact: robey@lag.net
 @license: GNU Lesser General Public License (LGPL)
@@ -59,8 +59,9 @@ if sys.version_info < (2, 2):
 
 
 __author__ = "Robey Pointer <robey@lag.net>"
-__date__ = "31 Oct 2005"
-__version__ = "1.5.1 (quilava)"
+__date__ = "04 Dec 2005"
+__version__ = "1.5.2 (rhydon)"
+__version_info__ = (1, 5, 2)
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 6d391f00..8714a960 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -149,7 +149,7 @@ class Transport (threading.Thread):
     """
 
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.5.1'
+    _CLIENT_ID = 'paramiko_1.5.2'
 
     _preferred_ciphers = ( 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc' )
     _preferred_macs = ( 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96' )
diff --git a/setup.py b/setup.py
index db19c541..ce7d0479 100644
--- a/setup.py
+++ b/setup.py
@@ -30,13 +30,13 @@ Required packages:
 '''
 
 setup(name = "paramiko",
-      version = "1.5.1",
+      version = "1.5.2",
       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.5.1.zip',
+      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.5.2.zip',
       license = 'LGPL',
       platforms = 'Posix; MacOS X; Windows',
       classifiers = [ 'Development Status :: 5 - Production/Stable',