[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#21115)

[benjamin.peterson]

http://hg.python.org/cpython/rev/c0d89375d4c8
changeset:   90073:c0d89375d4c8
parent:      90068:a76e459e09be
parent:      90072:7ac893834a5e
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Mar 31 13:47:04 2014 -0400
summary:
  merge 3.4 (#21115)

files:
  Lib/test/test_urllib2net.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -157,12 +157,12 @@
 ##             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"

-- 
Repository URL: http://hg.python.org/cpython