summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xdemos/demo.py2
-rw-r--r--demos/demo_server.py2
-rwxr-xr-xdemos/demo_sftp.py2
-rwxr-xr-xdemos/demo_simple.py2
-rw-r--r--demos/forward.py2
-rw-r--r--demos/interactive.py2
-rwxr-xr-xdemos/rforward.py2
-rw-r--r--paramiko/__init__.py14
-rw-r--r--paramiko/auth_handler.py2
-rw-r--r--paramiko/ber.py2
-rw-r--r--paramiko/buffered_pipe.py2
-rw-r--r--paramiko/channel.py2
-rw-r--r--paramiko/client.py2
-rw-r--r--paramiko/common.py2
-rw-r--r--paramiko/compress.py2
-rw-r--r--paramiko/config.py2
-rw-r--r--paramiko/dsskey.py2
-rw-r--r--paramiko/file.py2
-rw-r--r--paramiko/hostkeys.py2
-rw-r--r--paramiko/kex_gex.py2
-rw-r--r--paramiko/kex_group1.py2
-rw-r--r--paramiko/logging22.py2
-rw-r--r--paramiko/message.py2
-rw-r--r--paramiko/packet.py2
-rw-r--r--paramiko/pipe.py2
-rw-r--r--paramiko/pkey.py2
-rw-r--r--paramiko/primes.py2
-rw-r--r--paramiko/resource.py2
-rw-r--r--paramiko/rsakey.py2
-rw-r--r--paramiko/server.py2
-rw-r--r--paramiko/sftp.py2
-rw-r--r--paramiko/sftp_attr.py2
-rw-r--r--paramiko/sftp_client.py2
-rw-r--r--paramiko/sftp_file.py2
-rw-r--r--paramiko/sftp_handle.py2
-rw-r--r--paramiko/sftp_server.py2
-rw-r--r--paramiko/sftp_si.py2
-rw-r--r--paramiko/ssh_exception.py2
-rw-r--r--paramiko/transport.py4
-rw-r--r--paramiko/util.py2
-rw-r--r--setup.py8
-rw-r--r--setup_helper.py2
-rwxr-xr-xtest.py2
-rw-r--r--tests/loop.py2
-rw-r--r--tests/stub_sftp.py2
-rw-r--r--tests/test_auth.py2
-rw-r--r--tests/test_buffered_pipe.py2
-rw-r--r--tests/test_client.py2
-rwxr-xr-xtests/test_file.py2
-rw-r--r--tests/test_hostkeys.py2
-rw-r--r--tests/test_kex.py2
-rw-r--r--tests/test_message.py2
-rw-r--r--tests/test_packetizer.py2
-rw-r--r--tests/test_pkey.py2
-rwxr-xr-xtests/test_sftp.py2
-rw-r--r--tests/test_sftp_big.py2
-rw-r--r--tests/test_transport.py2
-rw-r--r--tests/test_util.py2
59 files changed, 70 insertions, 68 deletions
diff --git a/Makefile b/Makefile
index eb912a24..4ded790b 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 c8346ce8..05524d3c 100755
--- a/demos/demo.py
+++ b/demos/demo.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/demos/demo_server.py b/demos/demo_server.py
index e7b0e61b..4972928d 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 <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/demos/demo_sftp.py b/demos/demo_sftp.py
index a823fb32..992615f5 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 <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/demos/demo_simple.py b/demos/demo_simple.py
index b0774bf4..231da8df 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 <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/demos/forward.py b/demos/forward.py
index 33c98ab8..4e107855 100644
--- a/demos/forward.py
+++ b/demos/forward.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/demos/interactive.py b/demos/interactive.py
index b80e661e..4cbc6171 100644
--- a/demos/interactive.py
+++ b/demos/interactive.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/demos/rforward.py b/demos/rforward.py
index 810fea67..ef4c5329 100755
--- a/demos/rforward.py
+++ b/demos/rforward.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2008 Robey Pointer <robey@lag.net>
+# Copyright (C) 2008 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 9a8caec9..20f95ada 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2008 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2008 Robey Pointer <robeypointer@gmail.com>
#
# 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 <robey@lag.net>"
-__date__ = "06 Jul 2008"
-__version__ = "1.7.4 (Desmond)"
-__version_info__ = (1, 7, 4)
+__author__ = "Robey Pointer <robeypointer@gmail.com>"
+__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 a542f767..0f2e4f66 100644
--- a/paramiko/auth_handler.py
+++ b/paramiko/auth_handler.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/ber.py b/paramiko/ber.py
index 9d8ddfa2..19568dd5 100644
--- a/paramiko/ber.py
+++ b/paramiko/ber.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/buffered_pipe.py b/paramiko/buffered_pipe.py
index ae3d9d64..b19d74b2 100644
--- a/paramiko/buffered_pipe.py
+++ b/paramiko/buffered_pipe.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2006-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/channel.py b/paramiko/channel.py
index 910a03c5..f2ad1f51 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/client.py b/paramiko/client.py
index 2c079e6c..1808843f 100644
--- a/paramiko/client.py
+++ b/paramiko/client.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2006-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/common.py b/paramiko/common.py
index f4a4d814..7a374633 100644
--- a/paramiko/common.py
+++ b/paramiko/common.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/compress.py b/paramiko/compress.py
index 08fffb12..40b430f9 100644
--- a/paramiko/compress.py
+++ b/paramiko/compress.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/config.py b/paramiko/config.py
index 065dd918..2a2cbff3 100644
--- a/paramiko/config.py
+++ b/paramiko/config.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2006-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py
index 9f381d21..eecfa695 100644
--- a/paramiko/dsskey.py
+++ b/paramiko/dsskey.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/file.py b/paramiko/file.py
index 7db44015..d4aec8e3 100644
--- a/paramiko/file.py
+++ b/paramiko/file.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py
index 0c0ac8c3..851d2b17 100644
--- a/paramiko/hostkeys.py
+++ b/paramiko/hostkeys.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2006-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/kex_gex.py b/paramiko/kex_gex.py
index 63a0c994..c6be638e 100644
--- a/paramiko/kex_gex.py
+++ b/paramiko/kex_gex.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/kex_group1.py b/paramiko/kex_group1.py
index 843a6d8f..4228dd9d 100644
--- a/paramiko/kex_group1.py
+++ b/paramiko/kex_group1.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/logging22.py b/paramiko/logging22.py
index 9bf7656d..ed1d8919 100644
--- a/paramiko/logging22.py
+++ b/paramiko/logging22.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/message.py b/paramiko/message.py
index bcdfdba4..366c43c9 100644
--- a/paramiko/message.py
+++ b/paramiko/message.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/packet.py b/paramiko/packet.py
index 9c6ec26e..9072fbed 100644
--- a/paramiko/packet.py
+++ b/paramiko/packet.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/pipe.py b/paramiko/pipe.py
index 1cfed2d0..37191ef9 100644
--- a/paramiko/pipe.py
+++ b/paramiko/pipe.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/pkey.py b/paramiko/pkey.py
index 4e8b26bd..bb8c83c6 100644
--- a/paramiko/pkey.py
+++ b/paramiko/pkey.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/primes.py b/paramiko/primes.py
index 7b35736e..1cf79058 100644
--- a/paramiko/primes.py
+++ b/paramiko/primes.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/resource.py b/paramiko/resource.py
index a089754f..0d5c82fa 100644
--- a/paramiko/resource.py
+++ b/paramiko/resource.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/rsakey.py b/paramiko/rsakey.py
index d72d1758..a6652791 100644
--- a/paramiko/rsakey.py
+++ b/paramiko/rsakey.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/server.py b/paramiko/server.py
index bcaa4be4..6424b63a 100644
--- a/paramiko/server.py
+++ b/paramiko/server.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/sftp.py b/paramiko/sftp.py
index 2296d852..a0b08e02 100644
--- a/paramiko/sftp.py
+++ b/paramiko/sftp.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/sftp_attr.py b/paramiko/sftp_attr.py
index 9c928623..26290bec 100644
--- a/paramiko/sftp_attr.py
+++ b/paramiko/sftp_attr.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2006 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2006 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py
index d3929089..1f0d64ba 100644
--- a/paramiko/sftp_client.py
+++ b/paramiko/sftp_client.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/sftp_file.py b/paramiko/sftp_file.py
index cfa7db15..8c5c7aca 100644
--- a/paramiko/sftp_file.py
+++ b/paramiko/sftp_file.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/sftp_handle.py b/paramiko/sftp_handle.py
index e976f433..a6cd44a8 100644
--- a/paramiko/sftp_handle.py
+++ b/paramiko/sftp_handle.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/sftp_server.py b/paramiko/sftp_server.py
index 099ac12d..7cc6c0c3 100644
--- a/paramiko/sftp_server.py
+++ b/paramiko/sftp_server.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/sftp_si.py b/paramiko/sftp_si.py
index 47dd25d8..401a4e99 100644
--- a/paramiko/sftp_si.py
+++ b/paramiko/sftp_si.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/ssh_exception.py b/paramiko/ssh_exception.py
index e3120bbe..68924d0f 100644
--- a/paramiko/ssh_exception.py
+++ b/paramiko/ssh_exception.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/paramiko/transport.py b/paramiko/transport.py
index c6d2401c..1b758096 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# 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 2d932461..0d6a5348 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/setup.py b/setup.py
index 2041feae..e3edb674 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2008 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2008 Robey Pointer <robeypointer@gmail.com>
#
# 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 778d90a8..e8f3f2f3 100644
--- a/setup_helper.py
+++ b/setup_helper.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/test.py b/test.py
index b7f6c8a0..c0e9d151 100755
--- a/test.py
+++ b/test.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/loop.py b/tests/loop.py
index fb6ffaea..bdc2f2da 100644
--- a/tests/loop.py
+++ b/tests/loop.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/stub_sftp.py b/tests/stub_sftp.py
index ac292ff6..7f1ecc7e 100644
--- a/tests/stub_sftp.py
+++ b/tests/stub_sftp.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_auth.py b/tests/test_auth.py
index fadd8cad..816e978b 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Robey Pointer <robey@lag.net>
+# Copyright (C) 2008 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_buffered_pipe.py b/tests/test_buffered_pipe.py
index f96edb8f..f285d05b 100644
--- a/tests/test_buffered_pipe.py
+++ b/tests/test_buffered_pipe.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2006-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_client.py b/tests/test_client.py
index 59cd67cb..f7a17240 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_file.py b/tests/test_file.py
index d66babf1..c539b221 100755
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_hostkeys.py b/tests/test_hostkeys.py
index 28521ba3..e28a41d3 100644
--- a/tests/test_hostkeys.py
+++ b/tests/test_hostkeys.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2006-2007 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_kex.py b/tests/test_kex.py
index f3042753..2ecb757c 100644
--- a/tests/test_kex.py
+++ b/tests/test_kex.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_message.py b/tests/test_message.py
index e930f71c..7bfd44df 100644
--- a/tests/test_message.py
+++ b/tests/test_message.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_packetizer.py b/tests/test_packetizer.py
index cb6248f9..d1eb584a 100644
--- a/tests/test_packetizer.py
+++ b/tests/test_packetizer.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_pkey.py b/tests/test_pkey.py
index e591ab18..e40bee13 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index edc05990..3ba27013 100755
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_sftp_big.py b/tests/test_sftp_big.py
index c1827624..a32a7000 100644
--- a/tests/test_sftp_big.py
+++ b/tests/test_sftp_big.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 1e380acf..cea4a1dd 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#
diff --git a/tests/test_util.py b/tests/test_util.py
index d385bab2..3569abf8 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
#
# This file is part of paramiko.
#