diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2011-11-17 17:30:00 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2012-09-23 16:03:38 -0700 |
| commit | 7b7b23572b09627abc453a692a2e32951dd965d3 (patch) | |
| tree | 0af9e2550c07d9c25a155c68294d1bcb66a079b5 | |
| parent | 4d4780abaa9ee19920b3f5efd8fe08cd116bd515 (diff) | |
Let's not have 5 different freakin version strings
Also bumps to 1.7.10
(cherry picked from commit 01eea3326a79cf5df36be0dfd46cda7ba1cbae97)
Conflicts:
README
paramiko/__init__.py
paramiko/transport.py
setup.py
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | paramiko/__init__.py | 6 | ||||
| -rw-r--r-- | paramiko/transport.py | 3 | ||||
| -rw-r--r-- | setup.py | 4 |
4 files changed, 11 insertions, 6 deletions
@@ -9,8 +9,8 @@ paramiko :Homepage: http://www.lag.net/paramiko/ -paramiko 1.7.8 -================ +paramiko +======== Release of 16 May 2012 diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 6af46eb3..2b5cf43e 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -45,12 +45,16 @@ receive data over the encrypted session. Paramiko is written entirely in python (no C or platform-dependent code) and is released under the GNU Lesser General Public License (LGPL). +<<<<<<< HEAD:paramiko/__init__.py Website: U{http://www.lag.net/paramiko/} @version: 1.7.8 @author: Robey Pointer @contact: robeypointer@gmail.com @license: GNU Lesser General Public License (LGPL) +======= +Website: U{http://www.lag.net/ssh/} +>>>>>>> 01eea33... Let's not have 5 different freakin version strings:ssh/__init__.py """ import sys @@ -60,7 +64,7 @@ if sys.version_info < (2, 2): __author__ = "Jeff Forcier <jeff@bitprophet.org>" -__version__ = "1.7.8" +__version__ = "1.7.10" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/paramiko/transport.py b/paramiko/transport.py index 41507a2f..5884f549 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -29,6 +29,7 @@ import threading import time import weakref +import paramiko from paramiko import util from paramiko.auth_handler import AuthHandler from paramiko.channel import Channel @@ -194,7 +195,7 @@ class Transport (threading.Thread): """ _PROTO_ID = '2.0' - _CLIENT_ID = 'paramiko_1.7.7.2' + _CLIENT_ID = 'paramiko_%s' % (paramiko.__version__) _preferred_ciphers = ( 'aes128-ctr', 'aes256-ctr', 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc', 'arcfour128', 'arcfour256' ) @@ -48,10 +48,10 @@ if sys.platform == 'darwin': import setup_helper setup_helper.install_custom_make_tarball() +import paramiko setup(name = "paramiko", - version = "1.7.9", - version = "1.7.8", + version = paramiko.__version__, description = "SSH2 protocol library", author = "Jeff Forcier", author_email = "jeff@bitprophet.org", |