dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Let's not have 5 different freakin version strings 

Also bumps to 1.7.10
(cherry picked from commit 01eea3326a)

Conflicts:
	README
	paramiko/__init__.py
	paramiko/transport.py
	setup.py
This commit is contained in:
Jeff Forcier 2011-11-17 17:30:00 -08:00
parent 4d4780abaa
commit 7b7b23572b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -9,8 +9,8 @@ paramiko
:Homepage: http://www.lag.net/paramiko/ :Homepage: http://www.lag.net/paramiko/
paramiko 1.7.8 paramiko
================ ========
Release of 16 May 2012 Release of 16 May 2012

6
paramiko/__init__.py
View File

@ -45,12 +45,16 @@ receive data over the encrypted session.
Paramiko is written entirely in python (no C or platform-dependent code) and is Paramiko is written entirely in python (no C or platform-dependent code) and is
released under the GNU Lesser General Public License (LGPL). released under the GNU Lesser General Public License (LGPL).
<<<<<<< HEAD:paramiko/__init__.py
Website: U{http://www.lag.net/paramiko/} Website: U{http://www.lag.net/paramiko/}
@version: 1.7.8 @version: 1.7.8
@author: Robey Pointer @author: Robey Pointer
@contact: robeypointer@gmail.com @contact: robeypointer@gmail.com
@license: GNU Lesser General Public License (LGPL) @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 import sys
@ -60,7 +64,7 @@ if sys.version_info < (2, 2):
__author__ = "Jeff Forcier <jeff@bitprophet.org>" __author__ = "Jeff Forcier <jeff@bitprophet.org>"
__version__ = "1.7.8" __version__ = "1.7.10"
__license__ = "GNU Lesser General Public License (LGPL)" __license__ = "GNU Lesser General Public License (LGPL)"

3
paramiko/transport.py
View File

@ -29,6 +29,7 @@ import threading
import time import time
import weakref import weakref
import paramiko
from paramiko import util from paramiko import util
from paramiko.auth_handler import AuthHandler from paramiko.auth_handler import AuthHandler
from paramiko.channel import Channel from paramiko.channel import Channel
@ -194,7 +195,7 @@ class Transport (threading.Thread):
""" """
_PROTO_ID = '2.0' _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', _preferred_ciphers = ( 'aes128-ctr', 'aes256-ctr', 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc',
'arcfour128', 'arcfour256' ) 'arcfour128', 'arcfour256' )

4
setup.py
View File

@ -48,10 +48,10 @@ if sys.platform == 'darwin':
import setup_helper import setup_helper
setup_helper.install_custom_make_tarball() setup_helper.install_custom_make_tarball()
import paramiko
setup(name = "paramiko", setup(name = "paramiko",
version = "1.7.9", version = paramiko.__version__,
version = "1.7.8",
description = "SSH2 protocol library", description = "SSH2 protocol library",
author = "Jeff Forcier", author = "Jeff Forcier",
author_email = "jeff@bitprophet.org", author_email = "jeff@bitprophet.org",