From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 31 Mar 2014 17:46:45 +0000 (-0400)
Subject: merge 3.3 (#21115)
X-Git-Tag: v3.4.1rc1~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=887cd7d981d062d82b906b64e3c313c7b43908f2;p=python

merge 3.3 (#21115)
---

887cd7d981d062d82b906b64e3c313c7b43908f2
diff --cc Lib/test/test_urllib2net.py
index 3b2f2b8bc1,f50a2bb220..fd667f23b4
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@@ -162,16 -160,8 +162,16 @@@ class OtherNetworkTests(unittest.TestCa
              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"
 +        with support.transient_internet(redirect_url_with_frag):
 +            req = urllib.request.Request(redirect_url_with_frag)
 +            res = urllib.request.urlopen(req)
 +            self.assertEqual(res.geturl(),
 +                    "http://docs.python.org/3.4/glossary.html#term-global-interpreter-lock")
 +
      def test_custom_headers(self):
          url = "http://www.example.com"
          with support.transient_internet(url):