From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Apr 2010 21:59:57 +0000 (+0000)
Subject: Merged revisions 79908 via svnmerge from
X-Git-Tag: v3.2a1~1178
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87cb7876883130fe043ee24611c8e02fc48852d3;p=python

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 10bbd3a4be..1dea93f695 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)