mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-17 08:15:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #28435: Merge urllib test fixes from 3.5 into 3.6

Browse source
This commit is contained in:
Martin Panter 2016-10-22 03:21:36 +00:00
commit 85e81cfe9b
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/test_urllib2_localnet.py
View file

@ -323,6 +323,14 @@ class ProxyAuthTests(unittest.TestCase):
def setUp(self): def setUp(self):
super(ProxyAuthTests, self).setUp() super(ProxyAuthTests, self).setUp()
# Ignore proxy bypass settings in the environment.
def restore_environ(old_environ):
os.environ.clear()
os.environ.update(old_environ)
self.addCleanup(restore_environ, os.environ.copy())
os.environ['NO_PROXY'] = ''
os.environ['no_proxy'] = ''
self.digest_auth_handler = DigestAuthHandler() self.digest_auth_handler = DigestAuthHandler()
self.digest_auth_handler.set_users({self.USER: self.PASSWD}) self.digest_auth_handler.set_users({self.USER: self.PASSWD})
self.digest_auth_handler.set_realm(self.REALM) self.digest_auth_handler.set_realm(self.REALM)
@ -445,6 +453,7 @@ class TestUrlopen(unittest.TestCase):
os.environ.update(old_environ) os.environ.update(old_environ)
self.addCleanup(restore_environ, os.environ.copy()) self.addCleanup(restore_environ, os.environ.copy())
os.environ['NO_PROXY'] = '*' os.environ['NO_PROXY'] = '*'
os.environ['no_proxy'] = '*'
def urlopen(self, url, data=None, **kwargs): def urlopen(self, url, data=None, **kwargs):
l = [] l = []

1
Misc/ACKS
View file

@ -1473,6 +1473,7 @@ Al Sweigart
Thenault Sylvain Thenault Sylvain
Péter Szabó Péter Szabó
John Szakmeister John Szakmeister
Piotr Szczepaniak
Amir Szekely Amir Szekely
Maciej Szulik Maciej Szulik
Joel Taddei Joel Taddei