summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-31 17:46:45 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-03-31 17:46:45 (GMT)
commit887cd7d981d062d82b906b64e3c313c7b43908f2 (patch)
tree890762bbd897d32849416b2f832c2539946317ab /Lib
parentd2403a21e40a884d6dcc9a17bb491ad5447c6dbe (diff)
parentb25e3f9e6a1a8ea292335a23eb7dea9d8174efa1 (diff)
downloadcpython-887cd7d981d062d82b906b64e3c313c7b43908f2.zip
cpython-887cd7d981d062d82b906b64e3c313c7b43908f2.tar.gz
cpython-887cd7d981d062d82b906b64e3c313c7b43908f2.tar.bz2
merge 3.3 (#21115)
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 3b2f2b8..fd667f2 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -157,12 +157,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_redirect_url_withfrag(self):
redirect_url_with_frag = "http://bitly.com/urllibredirecttest"