From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 5 Nov 2014 16:30:00 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.3rc1~358
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67a98778669ebaf77a6d4b98775daa98ad2fac3b;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

67a98778669ebaf77a6d4b98775daa98ad2fac3b
diff --cc Lib/test/test_urllib2net.py
index 6f78cea1b79f,f618ecfdad6c..f39cec8fc3ad
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@@ -159,24 -154,14 +159,24 @@@ class OtherNetworkTests(unittest.TestCa
  
  ##             self._test_urls(urls, self._extra_handlers()+[bauth, dauth])
  
 +    @requires_ssl
      def test_urlwithfrag(self):
-         urlwith_frag = "https://docs.python.org/2/glossary.html#glossary"
+         urlwith_frag = "http://www.pythontest.net/index.html#frag"
          with support.transient_internet(urlwith_frag):
              req = urllib.request.Request(urlwith_frag)
              res = urllib.request.urlopen(req)
              self.assertEqual(res.geturl(),
-                     "https://docs.python.org/2/glossary.html#glossary")
+                     "http://www.pythontest.net/index.html#frag")
  
 +    @requires_ssl
 +    def test_redirect_url_withfrag(self):
 +        redirect_url_with_frag = "http://bit.ly/1iSHToT"
 +        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(),
 +                    "https://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):