diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-01-09 18:45:30 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-01-09 18:45:30 (GMT) |
| commit | 46a9900e099a82cda7328b0de16d6fffe52ee62a (patch) | |
| tree | dd4c8c8452493e0e3523d275a00e5c7d5a999ef7 /Lib/test | |
| parent | 68111a04b01f5fd8d2b65dd3021f35497d52ba46 (diff) | |
| download | cpython-46a9900e099a82cda7328b0de16d6fffe52ee62a.zip cpython-46a9900e099a82cda7328b0de16d6fffe52ee62a.tar.gz cpython-46a9900e099a82cda7328b0de16d6fffe52ee62a.tar.bz2 | |
Merged revisions 77209,77229,77359-77360,77371 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77209 | georg.brandl | 2010-01-01 07:07:05 -0600 (Fri, 01 Jan 2010) | 1 line
More yearly updates.
........
r77229 | georg.brandl | 2010-01-02 06:35:01 -0600 (Sat, 02 Jan 2010) | 1 line
Fix casing.
........
r77359 | georg.brandl | 2010-01-07 14:54:45 -0600 (Thu, 07 Jan 2010) | 1 line
Fix description for Py_GetPath(); it sounded like it always returned sys.path.
........
r77360 | georg.brandl | 2010-01-07 15:48:47 -0600 (Thu, 07 Jan 2010) | 1 line
#7653: clarify how the PythonPath registry key should look like.
........
r77371 | senthil.kumaran | 2010-01-08 13:20:25 -0600 (Fri, 08 Jan 2010) | 3 lines
Fix for Issue7026. For the Error - RuntimeError: dictionary changed size during iteration
........
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_hashlib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_logging.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_urllib.py | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 652c60e..2857737 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 aff0ce3..0575149 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 cae3619..ad0c100 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 |