[Python-checkins] cpython (3.4): Issue #20939: merge from 3.3

[larry.hastings]

http://hg.python.org/cpython/rev/7f4fba171a40
changeset:   89796:7f4fba171a40
branch:      3.4
user:        Ned Deily <nad at acm.org>
date:        Sat Mar 15 13:19:20 2014 -0700
summary:
  Issue #20939: merge from 3.3

files:
  Lib/test/test_urllibnet.py |  2 +-
  Misc/NEWS                  |  3 +++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -80,7 +80,7 @@
 
     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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@
 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?
 ===============================================

-- 
Repository URL: http://hg.python.org/cpython