Issue #20939: merge from 3.3

diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 4da89fcaaa1b109e023eda4ae1bfacdd50ffe047..fba6dbb8629662d676017ab3eebfba31d5825914 100644 (file)
--- 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 39b11977d880585eabca2a61d936fc1b2778fcb8..7fd12a6a80024bc6e9031e46aa4e2e8d88425f53 100644 (file)
--- 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?
 ===============================================