diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-01-09 18:48:46 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-01-09 18:48:46 (GMT) |
| commit | ffeda291153942f643f2a73c6f1dde563c614e42 (patch) | |
| tree | d1654925acdf8bf98376a0477bb25e600231f88a /Lib/test/test_urllib.py | |
| parent | 5e9615fa60762b24c32501b462195a6be41136a5 (diff) | |
| download | cpython-ffeda291153942f643f2a73c6f1dde563c614e42.zip cpython-ffeda291153942f643f2a73c6f1dde563c614e42.tar.gz cpython-ffeda291153942f643f2a73c6f1dde563c614e42.tar.bz2 | |
Merged revisions 77389 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77389 | benjamin.peterson | 2010-01-09 12:45:30 -0600 (Sat, 09 Jan 2010) | 25 lines
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/test_urllib.py')
| -rw-r--r-- | Lib/test/test_urllib.py | 4 |
1 files changed, 4 insertions, 0 deletions
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 |