summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-03-15 20:19:20 (GMT)
committerNed Deily <nad@acm.org>2014-03-15 20:19:20 (GMT)
commit7e7fb0374a44cb7eab9bf49970ba3ab150ef0cbf (patch)
treeb8bbc58b408ac64adf9bfdf1f68777d632ceb89e
parent8a553f5be493f0b75cec3421069db0f008600bc5 (diff)
parentb454742c64872fdb41d9c13a485711fbd849a4c9 (diff)
downloadcpython-7e7fb0374a44cb7eab9bf49970ba3ab150ef0cbf.zip
cpython-7e7fb0374a44cb7eab9bf49970ba3ab150ef0cbf.tar.gz
cpython-7e7fb0374a44cb7eab9bf49970ba3ab150ef0cbf.tar.bz2
Issue #20939: merge from 3.3
-rw-r--r--Lib/test/test_urllibnet.py2
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 4da89fc..fba6dbb 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 dd5d7da..bb90a8d 100644
--- a/Misc/NEWS
+++ b/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
-----