[Python-checkins] r60233 - python/trunk/Lib/urllib2.py

[neal.norwitz]

Author: neal.norwitz
Date: Thu Jan 24 08:40:51 2008
New Revision: 60233

Modified:
   python/trunk/Lib/urllib2.py
Log:
Fix the test_urllib2net failures that were caused by r58067.
I'm not sure this is the correct fix, but at least the test passes
now and should be closer to correct.


Modified: python/trunk/Lib/urllib2.py
==============================================================================
--- python/trunk/Lib/urllib2.py	(original)
+++ python/trunk/Lib/urllib2.py	Thu Jan 24 08:40:51 2008
@@ -1246,7 +1246,7 @@
         import mimetypes
         host = req.get_host()
         if not host:
-            raise URLError, ('ftp error', 'no host given')
+            raise URLError('ftp error: no host given')
         host, port = splitport(host)
         if port is None:
             port = ftplib.FTP_PORT
@@ -1292,7 +1292,7 @@
             headers = mimetools.Message(sf)
             return addinfourl(fp, headers, req.get_full_url())
         except ftplib.all_errors, msg:
-            raise URLError, ('ftp error', msg), sys.exc_info()[2]
+            raise URLError, ('ftp error: %s' % msg), sys.exc_info()[2]
 
     def connect_ftp(self, user, passwd, host, port, dirs, timeout):
         fw = ftpwrapper(user, passwd, host, port, dirs, timeout)