From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 27 Oct 2007 17:25:12 +0000 (+0000)
Subject: URLError now takes only a single parameter.  This was causing
X-Git-Tag: v3.0a2~259
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b16ca4ef1b903d09bf60d7f8616f6820fb397e1;p=python

URLError now takes only a single parameter.  This was causing
errors in test_urllib2net on the MIPS buildbot.
---

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index e9901282d5..d7679fc5eb 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1240,7 +1240,7 @@ class FTPHandler(BaseHandler):
         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 @@ class FTPHandler(BaseHandler):
             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)