[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-147]

1.2 (lapras)
bump version stuff to 1.2 / lapras.

5 files changed, 26 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index e2230fd5..93dbab3b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@
 # ivysaur (22oct04)
 # jigglypuff (6nov04) - 1.0
 # kabuto (12dec04) - 1.1
+# lapras (26feb05) - 1.2
 
 release:
 	python ./setup.py sdist --formats=zip
diff --git a/README b/README
index 149f0ab5..fd0e42be 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-paramiko 1.1
-"kabuto" release, 12 dec 2004
+paramiko 1.2
+"lapras" release, 26 feb 2005
 
 Copyright (c) 2003-2004 Robey Pointer <robey@lag.net>
 
@@ -149,6 +149,18 @@ the best and easiest examples of how to use the SFTP class.
 
 highlights of what's new in each release:
 
+v1.2 LAPRAS
+* added SFTPClient.listdir_attr() for fetching a list of files and their
+  attributes in one call
+* added Channel.recv_exit_status() and Channel.send_exit_status() for
+  manipulating the exit status of a command from either client or server
+  mode
+* moved check_global_request into ServerInterface, where it should've been
+  all along (oops)
+* SFTPHandle's default implementations are fleshed out more
+* made logging a bit more consistent
+* more unit tests
+
 v1.1 KABUTO
 * server-side SFTP support
 * added support for stderr streams on client & server channels
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index cf3783f8..fc8d32de 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -48,7 +48,7 @@ released under the GNU Lesser General Public License (LGPL).
 
 Website: U{http://www.lag.net/paramiko/}
 
-@version: 1.1 (kabuto)
+@version: 1.2 (lapras)
 @author: Robey Pointer
 @contact: robey@lag.net
 @license: GNU Lesser General Public License (LGPL)
@@ -61,8 +61,8 @@ if sys.version_info < (2, 2):
 
 
 __author__ = "Robey Pointer <robey@lag.net>"
-__date__ = "12 Dec 2004"
-__version__ = "1.1 (kabuto)"
+__date__ = "26 Feb 2005"
+__version__ = "1.2 (lapras)"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 17ac5450..b7a93c66 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -130,7 +130,7 @@ class BaseTransport (threading.Thread):
     is done here.
     """
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.1'
+    _CLIENT_ID = 'paramiko_1.2'
 
     _preferred_ciphers = ( 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc' )
     _preferred_macs = ( 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96' )
@@ -687,19 +687,19 @@ class BaseTransport (threading.Thread):
         fail because you haven't authenticated yet.
 
         @param hostkey: the host key expected from the server, or C{None} if
-        you don't want to do host key verification.
+            you don't want to do host key verification.
         @type hostkey: L{PKey<pkey.PKey>}
         @param username: the username to authenticate as.
         @type username: str
         @param password: a password to use for authentication, if you want to
-        use password authentication; otherwise C{None}.
+            use password authentication; otherwise C{None}.
         @type password: str
         @param pkey: a private key to use for authentication, if you want to
-        use private key authentication; otherwise C{None}.
+            use private key authentication; otherwise C{None}.
         @type pkey: L{PKey<pkey.PKey>}
         
         @raise SSHException: if the SSH2 negotiation fails, the host key
-        supplied by the server is incorrect, or authentication fails.
+            supplied by the server is incorrect, or authentication fails.
 
         @since: doduo
         """
diff --git a/setup.py b/setup.py
index ab4ba364..c2db5200 100644
--- a/setup.py
+++ b/setup.py
@@ -4,22 +4,20 @@ longdesc = '''
 This is a library for making SSH2 connections (client or server).
 Emphasis is on using SSH2 as an alternative to SSL for making secure
 connections between python scripts.  All major ciphers and hash methods
-are supported.
-
-SFTP client mode is now supported too.
+are supported.  SFTP client and server mode are both supported too.
 
 Required packages:
     pyCrypt
 '''
 
 setup(name = "paramiko",
-      version = "1.1",
+      version = "1.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.1.zip',
+      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.2.zip',
       license = 'LGPL',
       platforms = 'Posix; MacOS X; Windows',
       classifiers = [ 'Development Status :: 3 - Alpha',