From: Ned Deily <nad@acm.org>
Date: Sat, 15 Mar 2014 20:19:20 +0000 (-0700)
Subject: Issue #20939: merge from 3.3
X-Git-Tag: v3.4.0~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6b6a6d587d267cbad490232d08faebd30fdb7e2;p=python

Issue #20939: merge from 3.3
---

diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 4da89fcaaa..fba6dbb862 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 39b11977d8..7fd12a6a80 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?
 ===============================================