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

[benjamin.peterson]

https://hg.python.org/cpython/rev/826566b1b219
changeset:   93396:826566b1b219
parent:      93390:16d6c2443131
parent:      93395:2bad07298c5c
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Nov 05 11:31:02 2014 -0500
summary:
  merge 3.4

files:
  Lib/test/test_urllib2net.py |  5 ++---
  1 files changed, 2 insertions(+), 3 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
@@ -159,14 +159,13 @@
 
 ##             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):

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