diff --git a/Makefile b/Makefile index eb912a2..4ded790 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ # basil (21jan08) - 1.7.2 # clara (23mar08) - 1.7.3 # desmond (06jul08) - 1.7.4 +# ernest (19jul09) - 1.7.5 ifeq ($(wildcard /sbin/md5),/sbin/md5) @@ -73,3 +74,4 @@ test: # POST gpg sig on website! # POST md5sum on website! # RUN setup.py +# DO the push to pypy diff --git a/demos/demo.py b/demos/demo.py index c8346ce..05524d3 100755 --- a/demos/demo.py +++ b/demos/demo.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/demos/demo_server.py b/demos/demo_server.py index e7b0e61..4972928 100644 --- a/demos/demo_server.py +++ b/demos/demo_server.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/demos/demo_sftp.py b/demos/demo_sftp.py index a823fb3..992615f 100755 --- a/demos/demo_sftp.py +++ b/demos/demo_sftp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/demos/demo_simple.py b/demos/demo_simple.py index b0774bf..231da8d 100755 --- a/demos/demo_simple.py +++ b/demos/demo_simple.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/demos/forward.py b/demos/forward.py index 33c98ab..4e10785 100644 --- a/demos/forward.py +++ b/demos/forward.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/demos/interactive.py b/demos/interactive.py index b80e661..4cbc617 100644 --- a/demos/interactive.py +++ b/demos/interactive.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/demos/rforward.py b/demos/rforward.py index 810fea6..ef4c532 100755 --- a/demos/rforward.py +++ b/demos/rforward.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2008 Robey Pointer +# Copyright (C) 2008 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 9a8caec..20f95ad 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2008 Robey Pointer +# Copyright (C) 2003-2008 Robey Pointer # # This file is part of paramiko. # @@ -47,9 +47,9 @@ released under the GNU Lesser General Public License (LGPL). Website: U{http://www.lag.net/paramiko/} -@version: 1.7.4 (Desmond) +@version: 1.7.5 (Ernest) @author: Robey Pointer -@contact: robey@lag.net +@contact: robeypointer@gmail.com @license: GNU Lesser General Public License (LGPL) """ @@ -59,10 +59,10 @@ if sys.version_info < (2, 2): raise RuntimeError('You need python 2.2 for this module.') -__author__ = "Robey Pointer " -__date__ = "06 Jul 2008" -__version__ = "1.7.4 (Desmond)" -__version_info__ = (1, 7, 4) +__author__ = "Robey Pointer " +__date__ = "19 Jul 2009" +__version__ = "1.7.5 (Ernest)" +__version_info__ = (1, 7, 5) __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/paramiko/auth_handler.py b/paramiko/auth_handler.py index a542f76..0f2e4f6 100644 --- a/paramiko/auth_handler.py +++ b/paramiko/auth_handler.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/ber.py b/paramiko/ber.py index 9d8ddfa..19568dd 100644 --- a/paramiko/ber.py +++ b/paramiko/ber.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/buffered_pipe.py b/paramiko/buffered_pipe.py index ae3d9d6..b19d74b 100644 --- a/paramiko/buffered_pipe.py +++ b/paramiko/buffered_pipe.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/channel.py b/paramiko/channel.py index 910a03c..f2ad1f5 100644 --- a/paramiko/channel.py +++ b/paramiko/channel.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/client.py b/paramiko/client.py index 2c079e6..1808843 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/common.py b/paramiko/common.py index f4a4d81..7a37463 100644 --- a/paramiko/common.py +++ b/paramiko/common.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/compress.py b/paramiko/compress.py index 08fffb1..40b430f 100644 --- a/paramiko/compress.py +++ b/paramiko/compress.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/config.py b/paramiko/config.py index 065dd91..2a2cbff 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py index 9f381d2..eecfa69 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/file.py b/paramiko/file.py index 7db4401..d4aec8e 100644 --- a/paramiko/file.py +++ b/paramiko/file.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index 0c0ac8c..851d2b1 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/kex_gex.py b/paramiko/kex_gex.py index 63a0c99..c6be638 100644 --- a/paramiko/kex_gex.py +++ b/paramiko/kex_gex.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/kex_group1.py b/paramiko/kex_group1.py index 843a6d8..4228dd9 100644 --- a/paramiko/kex_group1.py +++ b/paramiko/kex_group1.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/logging22.py b/paramiko/logging22.py index 9bf7656..ed1d891 100644 --- a/paramiko/logging22.py +++ b/paramiko/logging22.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/message.py b/paramiko/message.py index bcdfdba..366c43c 100644 --- a/paramiko/message.py +++ b/paramiko/message.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/packet.py b/paramiko/packet.py index 9c6ec26..9072fbe 100644 --- a/paramiko/packet.py +++ b/paramiko/packet.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/pipe.py b/paramiko/pipe.py index 1cfed2d..37191ef 100644 --- a/paramiko/pipe.py +++ b/paramiko/pipe.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/pkey.py b/paramiko/pkey.py index 4e8b26b..bb8c83c 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/primes.py b/paramiko/primes.py index 7b35736..1cf7905 100644 --- a/paramiko/primes.py +++ b/paramiko/primes.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/resource.py b/paramiko/resource.py index a089754..0d5c82f 100644 --- a/paramiko/resource.py +++ b/paramiko/resource.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/rsakey.py b/paramiko/rsakey.py index d72d175..a665279 100644 --- a/paramiko/rsakey.py +++ b/paramiko/rsakey.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/server.py b/paramiko/server.py index bcaa4be..6424b63 100644 --- a/paramiko/server.py +++ b/paramiko/server.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/sftp.py b/paramiko/sftp.py index 2296d85..a0b08e0 100644 --- a/paramiko/sftp.py +++ b/paramiko/sftp.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/sftp_attr.py b/paramiko/sftp_attr.py index 9c92862..26290be 100644 --- a/paramiko/sftp_attr.py +++ b/paramiko/sftp_attr.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2006 Robey Pointer +# Copyright (C) 2003-2006 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py index d392908..1f0d64b 100644 --- a/paramiko/sftp_client.py +++ b/paramiko/sftp_client.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/sftp_file.py b/paramiko/sftp_file.py index cfa7db1..8c5c7ac 100644 --- a/paramiko/sftp_file.py +++ b/paramiko/sftp_file.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/sftp_handle.py b/paramiko/sftp_handle.py index e976f43..a6cd44a 100644 --- a/paramiko/sftp_handle.py +++ b/paramiko/sftp_handle.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/sftp_server.py b/paramiko/sftp_server.py index 099ac12..7cc6c0c 100644 --- a/paramiko/sftp_server.py +++ b/paramiko/sftp_server.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/sftp_si.py b/paramiko/sftp_si.py index 47dd25d..401a4e9 100644 --- a/paramiko/sftp_si.py +++ b/paramiko/sftp_si.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/ssh_exception.py b/paramiko/ssh_exception.py index e3120bb..68924d0 100644 --- a/paramiko/ssh_exception.py +++ b/paramiko/ssh_exception.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/paramiko/transport.py b/paramiko/transport.py index c6d2401..1b75809 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # @@ -198,7 +198,7 @@ class Transport (threading.Thread): """ _PROTO_ID = '2.0' - _CLIENT_ID = 'paramiko_1.7.4' + _CLIENT_ID = 'paramiko_1.7.5' _preferred_ciphers = ( 'aes128-ctr', 'aes256-ctr', 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc', 'arcfour128', 'arcfour256' ) diff --git a/paramiko/util.py b/paramiko/util.py index 2d93246..0d6a534 100644 --- a/paramiko/util.py +++ b/paramiko/util.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/setup.py b/setup.py index 2041fea..e3edb67 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2008 Robey Pointer +# Copyright (C) 2003-2008 Robey Pointer # # This file is part of paramiko. # @@ -48,13 +48,13 @@ if sys.platform == 'darwin': setup(name = "paramiko", - version = "1.7.4", + version = "1.7.5", description = "SSH2 protocol library", author = "Robey Pointer", - author_email = "robey@lag.net", + author_email = "robeypointer@gmail.com", url = "http://www.lag.net/paramiko/", packages = [ 'paramiko' ], - download_url = 'http://www.lag.net/paramiko/download/paramiko-1.7.4.zip', + download_url = 'http://www.lag.net/paramiko/download/paramiko-1.7.5.zip', license = 'LGPL', platforms = 'Posix; MacOS X; Windows', classifiers = [ 'Development Status :: 5 - Production/Stable', diff --git a/setup_helper.py b/setup_helper.py index 778d90a..e8f3f2f 100644 --- a/setup_helper.py +++ b/setup_helper.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/test.py b/test.py index b7f6c8a..c0e9d15 100755 --- a/test.py +++ b/test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/loop.py b/tests/loop.py index fb6ffae..bdc2f2d 100644 --- a/tests/loop.py +++ b/tests/loop.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/stub_sftp.py b/tests/stub_sftp.py index ac292ff..7f1ecc7 100644 --- a/tests/stub_sftp.py +++ b/tests/stub_sftp.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_auth.py b/tests/test_auth.py index fadd8ca..816e978 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -1,4 +1,4 @@ -# Copyright (C) 2008 Robey Pointer +# Copyright (C) 2008 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_buffered_pipe.py b/tests/test_buffered_pipe.py index f96edb8..f285d05 100644 --- a/tests/test_buffered_pipe.py +++ b/tests/test_buffered_pipe.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_client.py b/tests/test_client.py index 59cd67c..f7a1724 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_file.py b/tests/test_file.py index d66babf..c539b22 100755 --- a/tests/test_file.py +++ b/tests/test_file.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_hostkeys.py b/tests/test_hostkeys.py index 28521ba..e28a41d 100644 --- a/tests/test_hostkeys.py +++ b/tests/test_hostkeys.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_kex.py b/tests/test_kex.py index f304275..2ecb757 100644 --- a/tests/test_kex.py +++ b/tests/test_kex.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_message.py b/tests/test_message.py index e930f71..7bfd44d 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_packetizer.py b/tests/test_packetizer.py index cb6248f..d1eb584 100644 --- a/tests/test_packetizer.py +++ b/tests/test_packetizer.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_pkey.py b/tests/test_pkey.py index e591ab1..e40bee1 100644 --- a/tests/test_pkey.py +++ b/tests/test_pkey.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_sftp.py b/tests/test_sftp.py index edc0599..3ba2701 100755 --- a/tests/test_sftp.py +++ b/tests/test_sftp.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_sftp_big.py b/tests/test_sftp_big.py index c182762..a32a700 100644 --- a/tests/test_sftp_big.py +++ b/tests/test_sftp_big.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_transport.py b/tests/test_transport.py index 1e380ac..cea4a1d 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. # diff --git a/tests/test_util.py b/tests/test_util.py index d385bab..3569abf 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2003-2009 Robey Pointer # # This file is part of paramiko. #