Let's not have 5 different freakin version strings

Also bumps to 1.7.10
This commit is contained in:
Jeff Forcier 2011-11-17 17:30:00 -08:00
parent bd3a64fac2
commit 01eea3326a
4 changed files with 8 additions and 14 deletions

6
README
View File

@ -9,10 +9,8 @@ ssh
:Homepage: http://pypi.python.org/pypi/ssh/ :Homepage: http://pypi.python.org/pypi/ssh/
ssh 1.7.8 ssh
================ ===
Released October 23, 2011.
What What

View File

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

View File

@ -46,11 +46,6 @@ receive data over the encrypted session.
released under the GNU Lesser General Public License (LGPL). released under the GNU Lesser General Public License (LGPL).
Website: U{http://www.lag.net/ssh/} Website: U{http://www.lag.net/ssh/}
@version: 1.7.8
@author: Jeff Forcier
@contact: jeff@bitprophet.org
@license: GNU Lesser General Public License (LGPL)
""" """
import sys import sys
@ -60,9 +55,7 @@ if sys.version_info < (2, 2):
__author__ = "Jeff Forcier <jeff@bitprophet.org>" __author__ = "Jeff Forcier <jeff@bitprophet.org>"
__date__ = "23 October 2011" __version__ = "1.7.10"
__version__ = "1.7.8"
__version_info__ = (1, 7, 8)
__license__ = "GNU Lesser General Public License (LGPL)" __license__ = "GNU Lesser General Public License (LGPL)"

View File

@ -29,6 +29,7 @@ import threading
import time import time
import weakref import weakref
import ssh
from ssh import util from ssh import util
from ssh.auth_handler import AuthHandler from ssh.auth_handler import AuthHandler
from ssh.channel import Channel from ssh.channel import Channel
@ -194,7 +195,7 @@ class Transport (threading.Thread):
""" """
_PROTO_ID = '2.0' _PROTO_ID = '2.0'
_CLIENT_ID = 'ssh_1.7.8' _CLIENT_ID = 'ssh_%s' % (ssh.__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' )