[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#21115)
benjamin.peterson
python-checkins at python.org
Mon Mar 31 19:51:15 CEST 2014
http://hg.python.org/cpython/rev/c8bef5664305
changeset: 90075:c8bef5664305
parent: 90073:c0d89375d4c8
parent: 90074:d6fa1b30cdac
user: Benjamin Peterson <benjamin at python.org>
date: Mon Mar 31 13:50:45 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
@@ -165,12 +165,12 @@
"https://docs.python.org/2/glossary.html#glossary")
def test_redirect_url_withfrag(self):
- redirect_url_with_frag = "http://bitly.com/urllibredirecttest"
+ 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(),
- "http://docs.python.org/3.4/glossary.html#term-global-interpreter-lock")
+ "https://docs.python.org/3.4/glossary.html#term-global-interpreter-lock")
def test_custom_headers(self):
url = "http://www.example.com"
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list