summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_urllib.py
diff options
context:
space:
mode:
authorXiang Zhang <angwerzx@126.com>2017-01-09 03:50:02 (GMT)
committerXiang Zhang <angwerzx@126.com>2017-01-09 03:50:02 (GMT)
commitc44d58a77a123873b093c4690056ef4d20e873f3 (patch)
treef7d8d341e7938ef0e9899066622b944bc620b38b /Lib/test/test_urllib.py
parent19c7238560644accd00c6ccd4497ef40142a06c2 (diff)
parent959ff7f1c6412fe768a29ffe1d355f126dc9e80c (diff)
downloadcpython-c44d58a77a123873b093c4690056ef4d20e873f3.zip
cpython-c44d58a77a123873b093c4690056ef4d20e873f3.tar.gz
cpython-c44d58a77a123873b093c4690056ef4d20e873f3.tar.bz2
Issue #29142: Merge 3.5.
Diffstat (limited to 'Lib/test/test_urllib.py')
-rw-r--r--Lib/test/test_urllib.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 43ea6b8..5084486 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -247,11 +247,12 @@ class ProxyTests(unittest.TestCase):
def test_proxy_bypass_environment_host_match(self):
bypass = urllib.request.proxy_bypass_environment
self.env.set('NO_PROXY',
- 'localhost, anotherdomain.com, newdomain.com:1234')
+ 'localhost, anotherdomain.com, newdomain.com:1234, .d.o.t')
self.assertTrue(bypass('localhost'))
self.assertTrue(bypass('LocalHost')) # MixedCase
self.assertTrue(bypass('LOCALHOST')) # UPPERCASE
self.assertTrue(bypass('newdomain.com:1234'))
+ self.assertTrue(bypass('foo.d.o.t')) # issue 29142
self.assertTrue(bypass('anotherdomain.com:8888'))
self.assertTrue(bypass('www.newdomain.com:1234'))
self.assertFalse(bypass('prelocalhost'))