summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-03-15 20:19:20 (GMT)
committerNed Deily <nad@acm.org>2014-03-15 20:19:20 (GMT)
commitb6b6a6d587d267cbad490232d08faebd30fdb7e2 (patch)
treefe6c84eb59de7e0e63f0e9ea318244731aaa6fba
parent6dfc632f1f8407079d728bc71c10704d078662e2 (diff)
downloadcpython-b6b6a6d587d267cbad490232d08faebd30fdb7e2.zip
cpython-b6b6a6d587d267cbad490232d08faebd30fdb7e2.tar.gz
cpython-b6b6a6d587d267cbad490232d08faebd30fdb7e2.tar.bz2
Issue #20939: merge from 3.3
-rw-r--r--Lib/test/test_urllibnet.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 4da89fc..fba6dbb 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -80,7 +80,7 @@ class urlopenNetworkTests(unittest.TestCase):
def test_geturl(self):
# Make sure same URL as opened is returned by geturl.
- URL = "http://www.python.org/"
+ URL = "https://www.python.org/"
with self.urlopen(URL) as open_url:
gotten_url = open_url.geturl()
self.assertEqual(gotten_url, URL)
diff --git a/Misc/NEWS b/Misc/NEWS
index 39b1197..7fd12a6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@ Core and Builtins
Library
-------
+- Issue #20939: Fix test_geturl failure in test_urllibnet due to
+ new redirect of http://www.python.org/ to https://www.python.org.
+
What's New in Python 3.4.0 release candidate 3?
===============================================