URLError now takes only a single parameter. This was causing
errors in test_urllib2net on the MIPS buildbot.
This commit is contained in:
parent
96bf3cc3fc
commit
1b16ca4ef1
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue