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

[benjamin.peterson]

https://hg.python.org/cpython/rev/4045f28ccbec
changeset:   93394:4045f28ccbec
branch:      3.4
parent:      93388:d05ba48cfc29
parent:      93393:6c46859edfd7
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Nov 05 11:30:00 2014 -0500
summary:
  merge 3.3

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
@@ -161,12 +161,12 @@
 
     @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