From e37f0b57bd1cef9739c8c870bc954941b9fc4453 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Sun, 23 Oct 2011 00:47:50 -0700 Subject: [PATCH] Copyright update, pending removal of preamble from all files --- README | 2 +- demos/demo.py | 2 +- demos/demo_server.py | 2 +- demos/demo_sftp.py | 2 +- demos/demo_simple.py | 2 +- demos/forward.py | 2 +- demos/interactive.py | 2 +- demos/rforward.py | 2 +- setup.py | 2 +- setup_helper.py | 2 +- ssh/__init__.py | 10 +++++----- ssh/agent.py | 2 +- ssh/auth_handler.py | 2 +- ssh/ber.py | 2 +- ssh/buffered_pipe.py | 2 +- ssh/channel.py | 2 +- ssh/client.py | 2 +- ssh/common.py | 2 +- ssh/compress.py | 2 +- ssh/config.py | 2 +- ssh/dsskey.py | 2 +- ssh/file.py | 2 +- ssh/hostkeys.py | 2 +- ssh/kex_gex.py | 2 +- ssh/kex_group1.py | 2 +- ssh/logging22.py | 2 +- ssh/message.py | 2 +- ssh/packet.py | 2 +- ssh/pipe.py | 2 +- ssh/pkey.py | 2 +- ssh/primes.py | 2 +- ssh/resource.py | 2 +- ssh/rsakey.py | 2 +- ssh/server.py | 2 +- ssh/sftp.py | 2 +- ssh/sftp_attr.py | 2 +- ssh/sftp_client.py | 2 +- ssh/sftp_file.py | 2 +- ssh/sftp_handle.py | 2 +- ssh/sftp_server.py | 2 +- ssh/sftp_si.py | 2 +- ssh/ssh_exception.py | 2 +- ssh/transport.py | 4 ++-- ssh/util.py | 2 +- test.py | 2 +- tests/loop.py | 2 +- tests/stub_sftp.py | 2 +- tests/test_auth.py | 2 +- tests/test_buffered_pipe.py | 2 +- tests/test_client.py | 2 +- tests/test_file.py | 2 +- tests/test_hostkeys.py | 2 +- tests/test_kex.py | 2 +- tests/test_message.py | 2 +- tests/test_packetizer.py | 2 +- tests/test_pkey.py | 2 +- tests/test_sftp.py | 2 +- tests/test_sftp_big.py | 2 +- tests/test_transport.py | 2 +- tests/test_util.py | 2 +- 60 files changed, 65 insertions(+), 65 deletions(-) diff --git a/README b/README index a15e9d2..ccc2fe6 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ ssh :'ssh': Python SSH module :Copyright: Copyright (c) 2011 Jeff Forcier -:Copyright: Based on the Paramiko module, Copyright (c) 2003-2009 Robey Pointer +:Copyright: Based on the Paramiko module, Copyright (c) 2011 Jeff Forcier :License: LGPL :Homepage: http://pypi.python.org/pypi/ssh/ diff --git a/demos/demo.py b/demos/demo.py index 5ae7410..cab1ae8 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) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/demos/demo_server.py b/demos/demo_server.py index 3465310..de27220 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) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/demos/demo_sftp.py b/demos/demo_sftp.py index 270c0d1..7586cc4 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) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/demos/demo_simple.py b/demos/demo_simple.py index c46a9e4..cb67f7a 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) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/demos/forward.py b/demos/forward.py index 249ee53..87b4527 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) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/demos/interactive.py b/demos/interactive.py index 2aa4f7e..1ecf3f3 100644 --- a/demos/interactive.py +++ b/demos/interactive.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/demos/rforward.py b/demos/rforward.py index c9f4616..f5c1c2f 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 Jeff Forcier # # This file is part of ssh. # diff --git a/setup.py b/setup.py index 2fdf4f4..8a6a0c2 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2008 Robey Pointer +# Copyright (C) 2003-2008 Jeff Forcier # # This file is part of ssh. # diff --git a/setup_helper.py b/setup_helper.py index 9c0cffb..9206aae 100644 --- a/setup_helper.py +++ b/setup_helper.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/__init__.py b/ssh/__init__.py index 6e8c0d6..8aa978e 100644 --- a/ssh/__init__.py +++ b/ssh/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2011 Robey Pointer +# Copyright (C) 2003-2011 Jeff Forcier # # This file is part of ssh. # @@ -48,8 +48,8 @@ released under the GNU Lesser General Public License (LGPL). Website: U{http://www.lag.net/ssh/} @version: 1.7.8 -@author: Robey Pointer -@contact: robeypointer@gmail.com +@author: Jeff Forcier +@contact: jeff@bitprophet.org @license: GNU Lesser General Public License (LGPL) """ @@ -59,8 +59,8 @@ if sys.version_info < (2, 2): raise RuntimeError('You need python 2.2 for this module.') -__author__ = "Robey Pointer " -__date__ = "21 May 2011" +__author__ = "Jeff Forcier " +__date__ = "23 October 2011" __version__ = "1.7.8" __version_info__ = (1, 7, 8) __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/ssh/agent.py b/ssh/agent.py index 95b1034..015e103 100644 --- a/ssh/agent.py +++ b/ssh/agent.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 John Rochester +# Copyright (C) 2011 John Rochester # # This file is part of ssh. # diff --git a/ssh/auth_handler.py b/ssh/auth_handler.py index 368fa71..352b2b1 100644 --- a/ssh/auth_handler.py +++ b/ssh/auth_handler.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/ber.py b/ssh/ber.py index ddc8070..acf7d8f 100644 --- a/ssh/ber.py +++ b/ssh/ber.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/buffered_pipe.py b/ssh/buffered_pipe.py index 2d2b3e7..6b92892 100644 --- a/ssh/buffered_pipe.py +++ b/ssh/buffered_pipe.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/channel.py b/ssh/channel.py index 5162b36..f3bf6d8 100644 --- a/ssh/channel.py +++ b/ssh/channel.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/client.py b/ssh/client.py index d5209fa..9e6317a 100644 --- a/ssh/client.py +++ b/ssh/client.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/common.py b/ssh/common.py index 168161d..8f6a77c 100644 --- a/ssh/common.py +++ b/ssh/common.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/compress.py b/ssh/compress.py index ca7d9ed..0b5a425 100644 --- a/ssh/compress.py +++ b/ssh/compress.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/config.py b/ssh/config.py index 57e6bad..8c1451b 100644 --- a/ssh/config.py +++ b/ssh/config.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/dsskey.py b/ssh/dsskey.py index 765a73c..b1b662c 100644 --- a/ssh/dsskey.py +++ b/ssh/dsskey.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/file.py b/ssh/file.py index 2a813c8..1403726 100644 --- a/ssh/file.py +++ b/ssh/file.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/hostkeys.py b/ssh/hostkeys.py index 5e59661..6ee9fdc 100644 --- a/ssh/hostkeys.py +++ b/ssh/hostkeys.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2007 Robey Pointer +# Copyright (C) 2006-2007 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/kex_gex.py b/ssh/kex_gex.py index 78d2fab..78dfb30 100644 --- a/ssh/kex_gex.py +++ b/ssh/kex_gex.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/kex_group1.py b/ssh/kex_group1.py index 9e68023..9378a9b 100644 --- a/ssh/kex_group1.py +++ b/ssh/kex_group1.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/logging22.py b/ssh/logging22.py index 7be2b69..154d59d 100644 --- a/ssh/logging22.py +++ b/ssh/logging22.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/message.py b/ssh/message.py index ca9226c..24a06fd 100644 --- a/ssh/message.py +++ b/ssh/message.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/packet.py b/ssh/packet.py index 8ac8c4d..47b721c 100644 --- a/ssh/packet.py +++ b/ssh/packet.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/pipe.py b/ssh/pipe.py index c36845a..ccee94d 100644 --- a/ssh/pipe.py +++ b/ssh/pipe.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/pkey.py b/ssh/pkey.py index e284562..ba0b158 100644 --- a/ssh/pkey.py +++ b/ssh/pkey.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/primes.py b/ssh/primes.py index 475b6e6..18bff1a 100644 --- a/ssh/primes.py +++ b/ssh/primes.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/resource.py b/ssh/resource.py index 75702d1..2bcf8d9 100644 --- a/ssh/resource.py +++ b/ssh/resource.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/rsakey.py b/ssh/rsakey.py index f3f2d9c..bec9de7 100644 --- a/ssh/rsakey.py +++ b/ssh/rsakey.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/server.py b/ssh/server.py index 9bf80fd..dae2d96 100644 --- a/ssh/server.py +++ b/ssh/server.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/sftp.py b/ssh/sftp.py index 6d0f8f1..eb0b43f 100644 --- a/ssh/sftp.py +++ b/ssh/sftp.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/sftp_attr.py b/ssh/sftp_attr.py index 09d9cf9..9433599 100644 --- a/ssh/sftp_attr.py +++ b/ssh/sftp_attr.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2006 Robey Pointer +# Copyright (C) 2003-2006 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/sftp_client.py b/ssh/sftp_client.py index af2b02d..7d2a43e 100644 --- a/ssh/sftp_client.py +++ b/ssh/sftp_client.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/sftp_file.py b/ssh/sftp_file.py index 8700bb8..218f7cb 100644 --- a/ssh/sftp_file.py +++ b/ssh/sftp_file.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/sftp_handle.py b/ssh/sftp_handle.py index 8b894d4..8478736 100644 --- a/ssh/sftp_handle.py +++ b/ssh/sftp_handle.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/sftp_server.py b/ssh/sftp_server.py index a4ecec5..b521f3c 100644 --- a/ssh/sftp_server.py +++ b/ssh/sftp_server.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/sftp_si.py b/ssh/sftp_si.py index 12d9461..21ec765 100644 --- a/ssh/sftp_si.py +++ b/ssh/sftp_si.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/ssh_exception.py b/ssh/ssh_exception.py index 5302d0f..2f1e0c6 100644 --- a/ssh/ssh_exception.py +++ b/ssh/ssh_exception.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/ssh/transport.py b/ssh/transport.py index f3d7d24..9cb014e 100644 --- a/ssh/transport.py +++ b/ssh/transport.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # @@ -194,7 +194,7 @@ class Transport (threading.Thread): """ _PROTO_ID = '2.0' - _CLIENT_ID = 'ssh_1.7.7.1' + _CLIENT_ID = 'ssh_1.7.8' _preferred_ciphers = ( 'aes128-ctr', 'aes256-ctr', 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc', 'arcfour128', 'arcfour256' ) diff --git a/ssh/util.py b/ssh/util.py index c89f020..816d80d 100644 --- a/ssh/util.py +++ b/ssh/util.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/test.py b/test.py index a6eb766..a92f150 100755 --- a/test.py +++ b/test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2003-2007 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/loop.py b/tests/loop.py index 4e5ed93..ac48a87 100644 --- a/tests/loop.py +++ b/tests/loop.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/stub_sftp.py b/tests/stub_sftp.py index 54ba1ab..172f33a 100644 --- a/tests/stub_sftp.py +++ b/tests/stub_sftp.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_auth.py b/tests/test_auth.py index ef8e965..db4b7c5 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -1,4 +1,4 @@ -# Copyright (C) 2008 Robey Pointer +# Copyright (C) 2008 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_buffered_pipe.py b/tests/test_buffered_pipe.py index 07a3515..a656e3b 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 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_client.py b/tests/test_client.py index 1ef38ef..45e34ec 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_file.py b/tests/test_file.py index 4cbdaff..999a0f8 100755 --- a/tests/test_file.py +++ b/tests/test_file.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_hostkeys.py b/tests/test_hostkeys.py index 21330dc..7b9bbc7 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 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_kex.py b/tests/test_kex.py index b52b71b..4c46728 100644 --- a/tests/test_kex.py +++ b/tests/test_kex.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_message.py b/tests/test_message.py index 3272477..b6abd5c 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_packetizer.py b/tests/test_packetizer.py index 1adb28a..da23f7a 100644 --- a/tests/test_packetizer.py +++ b/tests/test_packetizer.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_pkey.py b/tests/test_pkey.py index 5353b81..18bd1e1 100644 --- a/tests/test_pkey.py +++ b/tests/test_pkey.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_sftp.py b/tests/test_sftp.py index afce853..752bc39 100755 --- a/tests/test_sftp.py +++ b/tests/test_sftp.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_sftp_big.py b/tests/test_sftp_big.py index 8c6fb31..f1a5ce2 100644 --- a/tests/test_sftp_big.py +++ b/tests/test_sftp_big.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_transport.py b/tests/test_transport.py index 1c7d307..b25a23f 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. # diff --git a/tests/test_util.py b/tests/test_util.py index 6bd02cf..b44aa0e 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2009 Robey Pointer +# Copyright (C) 2011 Jeff Forcier # # This file is part of ssh. #