diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-04-11 21:59:57 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-04-11 21:59:57 (GMT) |
commit | 87cb7876883130fe043ee24611c8e02fc48852d3 (patch) | |
tree | 0a774c2375fae3bd69f9108e60fd96d460124d03 /Lib/test | |
parent | 7f1fddc4e0a537fa13edb7dd00e7044e0a471a40 (diff) | |
download | cpython-87cb7876883130fe043ee24611c8e02fc48852d3.zip cpython-87cb7876883130fe043ee24611c8e02fc48852d3.tar.gz cpython-87cb7876883130fe043ee24611c8e02fc48852d3.tar.bz2 |
Merged revisions 79908 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79908 | martin.v.loewis | 2010-04-08 12:40:54 -0500 (Thu, 08 Apr 2010) | 2 lines
Issue #8348: Fix test ftp url in test_urllib2net.
........
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_urllib2net.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py index 10bbd3a..1dea93f 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -217,7 +217,7 @@ class TimeoutTest(unittest.TestCase): u = _urlopen_with_retry("http://www.python.org", timeout=120) self.assertEqual(u.fp.raw._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) |