[Python-checkins] r79973 - in python/branches/py3k: Lib/test/test_urllib2net.py

benjamin.peterson python-checkins at python.org
Sun Apr 11 23:59:57 CEST 2010


Author: benjamin.peterson
Date: Sun Apr 11 23:59:57 2010
New Revision: 79973

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_urllib2net.py

Modified: python/branches/py3k/Lib/test/test_urllib2net.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib2net.py	(original)
+++ python/branches/py3k/Lib/test/test_urllib2net.py	Sun Apr 11 23:59:57 2010
@@ -217,7 +217,7 @@
         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)


More information about the Python-checkins mailing list