summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-04-08 17:40:54 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-04-08 17:40:54 (GMT)
commit7bc26b9be66e56819f3b3de5898eb8af9e0761b1 (patch)
tree72baa4ae191628e2e3d5207fb14e3765f9b754e8
parente84089e3f1000ba1d060931e416dc148fe79d6eb (diff)
downloadcpython-7bc26b9be66e56819f3b3de5898eb8af9e0761b1.zip
cpython-7bc26b9be66e56819f3b3de5898eb8af9e0761b1.tar.gz
cpython-7bc26b9be66e56819f3b3de5898eb8af9e0761b1.tar.bz2
Issue #8348: Fix test ftp url in test_urllib2net.
-rw-r--r--Lib/test/test_urllib2net.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 5415145..eaa7154 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -220,7 +220,7 @@ class TimeoutTest(unittest.TestCase):
u = _urlopen_with_retry("http://www.python.org", timeout=120)
self.assertEqual(u.fp._sock.fp._sock.gettimeout(), 120)
- FTP_HOST = "ftp://ftp.mirror.nl/pub/mirror/gnu/"
+ FTP_HOST = "ftp://ftp.mirror.nl/pub/gnu/"
def test_ftp_basic(self):
self.assertTrue(socket.getdefaulttimeout() is None)
diff --git a/Misc/NEWS b/Misc/NEWS
index 3aff2a8..e11d9cd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -58,6 +58,8 @@ Core and Builtins
Library
-------
+- Issue #8348: Fix test ftp url in test_urllib2net.
+
- Issue #8204: Fix test_ttk notebook test by forcing focus.
- Issue #8344: Fix test_ttk bug on FreeBSD.