Issue #20939: merge from 3.3

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)

Misc/NEWS

@@ -72,6 +72,10 @@ Tests
 
 - Issue #20743: Fix a reference leak in test_tcl.
 
+- Issue #20939: Fix test_geturl failure in test_urllibnet due to
+  new redirect of http://www.python.org/ to https://www.python.org.
+
+
 Build
 -----