Issue #20939: merge from 3.3

ned-deily · ned-deily · commit b6b6a6d587d2 · 2014-03-15T13:19:20.000-07:00
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
@@ -80,7 +80,7 @@ def test_info(self):
 
     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
@@ -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?
 ===============================================
