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.
........

diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 10bbd3a4be46f73125c89c2165c69a5cf000a1a7..1dea93f695d842beedf3dd0e32be24d4ac2cff5f 100644 (file)
--- 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)