mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-29 04:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

URLError now takes only a single parameter. This was causing

Browse Source 
errors in test_urllib2net on the MIPS buildbot.
This commit is contained in:
Neal Norwitz 2007-10-27 17:25:12 +00:00
parent 96bf3cc3fc
commit 1b16ca4ef1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/urllib2.py
View File

@ -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)