diff options
| author | Xiang Zhang <angwerzx@126.com> | 2017-01-09 11:50:02 +0800 |
|---|---|---|
| committer | Xiang Zhang <angwerzx@126.com> | 2017-01-09 11:50:02 +0800 |
| commit | 98220f6f241ac72cc78b9587905b3245b497a83a (patch) | |
| tree | 86759b947c142e1dd3fe47c9c2b122d49bf95ff1 /Lib/test | |
| parent | da870a7007749ed0f18383e4db31d6dcf521953b (diff) | |
| parent | 852e2d9f0ec2373747899f2ef962d40f29c47b56 (diff) | |
| download | cpython-98220f6f241ac72cc78b9587905b3245b497a83a.tar.gz | |
Issue #29142: Merge 3.5.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_urllib.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 43ea6b8b57..5084486e5a 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')) |