[Python-3000-checkins] r58694 - python/branches/py3k/Lib/urllib2.py

[neal.norwitz]

Author: neal.norwitz
Date: Sat Oct 27 19:25:12 2007
New Revision: 58694

Modified:
   python/branches/py3k/Lib/urllib2.py
Log:
URLError now takes only a single parameter.  This was causing 
errors in test_urllib2net on the MIPS buildbot.


Modified: python/branches/py3k/Lib/urllib2.py
==============================================================================
--- python/branches/py3k/Lib/urllib2.py	(original)
+++ python/branches/py3k/Lib/urllib2.py	Sat Oct 27 19:25:12 2007
@@ -1240,7 +1240,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
@@ -1286,7 +1286,7 @@
             headers = mimetools.Message(sf)
             return addinfourl(fp, headers, req.get_full_url())
         except ftplib.all_errors as msg:
-            raise URLError('ftp error', msg).with_traceback(sys.exc_info()[2])
+            raise URLError('ftp error %s' % msg).with_traceback(sys.exc_info()[2])
 
     def connect_ftp(self, user, passwd, host, port, dirs, timeout):
         fw = ftpwrapper(user, passwd, host, port, dirs, timeout)