summaryrefslogtreecommitdiff
path: root/Lib/test
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_hashlib.py2
-rw-r--r--Lib/test/test_logging.py4
-rw-r--r--Lib/test/test_urllib.py4
3 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
index 652c60e3c8..2857737f03 100644
--- a/Lib/test/test_hashlib.py
+++ b/Lib/test/test_hashlib.py
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Copyright (C) 2005-2009 Gregory P. Smith (greg@krypto.org)
+# Copyright (C) 2005-2010 Gregory P. Smith (greg@krypto.org)
# Licensed to PSF under a Contributor Agreement.
#
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index aff0ce3a67..05751490f2 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2001-2009 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2010 by Vinay Sajip. All Rights Reserved.
#
# Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose and without fee is hereby granted,
@@ -18,7 +18,7 @@
"""Test harness for the logging module. Run all tests.
-Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
"""
import logging
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index cae3619138..ad0c100003 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -119,6 +119,10 @@ class ProxyTests(unittest.TestCase):
def setUp(self):
# Records changes to env vars
self.env = support.EnvironmentVarGuard()
+ # Delete all proxy related env vars
+ for k in os.environ.keys():
+ if 'proxy' in k.lower():
+ self.env.unset(k)
def tearDown(self):
# Restore all proxy related env vars