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

ned.deily python-checkins at python.org
Sat Mar 15 21:19:56 CET 2014


http://hg.python.org/cpython/rev/9358a41b245b
changeset: 89675:9358a41b245b
parent: 89672:fe0ad06da28c
parent: 89674:030efedd70ca
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 | 4 ++++
 2 files changed, 5 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
@@ -72,6 +72,10 @@
 
 - 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
 -----
 
-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list

AltStyle によって変換されたページ (->オリジナル) /