summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-31 17:46:26 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-03-31 17:46:26 (GMT)
commitb25e3f9e6a1a8ea292335a23eb7dea9d8174efa1 (patch)
tree2d6dbac923287c78b5e769986a21329fb6413555 /Lib
parentaa2d085d2951a7b5c7c81d30a2fdd333a2fa7145 (diff)
parentb4be376d16cba52c91afc5a9dc8ff36ae96e26d9 (diff)
downloadcpython-b25e3f9e6a1a8ea292335a23eb7dea9d8174efa1.zip
cpython-b25e3f9e6a1a8ea292335a23eb7dea9d8174efa1.tar.gz
cpython-b25e3f9e6a1a8ea292335a23eb7dea9d8174efa1.tar.bz2
merge 3.2
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_urllib2net.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 4981c24..f50a2bb 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -155,12 +155,12 @@ class OtherNetworkTests(unittest.TestCase):
## self._test_urls(urls, self._extra_handlers()+[bauth, dauth])
def test_urlwithfrag(self):
- urlwith_frag = "http://docs.python.org/2/glossary.html#glossary"
+ urlwith_frag = "https://docs.python.org/2/glossary.html#glossary"
with support.transient_internet(urlwith_frag):
req = urllib.request.Request(urlwith_frag)
res = urllib.request.urlopen(req)
self.assertEqual(res.geturl(),
- "http://docs.python.org/2/glossary.html#glossary")
+ "https://docs.python.org/2/glossary.html#glossary")
def test_custom_headers(self):
url = "http://www.example.com"