diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2007-10-27 17:25:12 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2007-10-27 17:25:12 (GMT) |
| commit | 1b16ca4ef1b903d09bf60d7f8616f6820fb397e1 (patch) | |
| tree | 4dec0144ac1e3ad2676ae7a84418f790cf852865 /Lib/urllib2.py | |
| parent | 96bf3cc3fcf48b47230d13bb07d45abc17ea6ac9 (diff) | |
| download | cpython-1b16ca4ef1b903d09bf60d7f8616f6820fb397e1.zip cpython-1b16ca4ef1b903d09bf60d7f8616f6820fb397e1.tar.gz cpython-1b16ca4ef1b903d09bf60d7f8616f6820fb397e1.tar.bz2 | |
URLError now takes only a single parameter. This was causing
errors in test_urllib2net on the MIPS buildbot.
Diffstat (limited to 'Lib/urllib2.py')
| -rw-r--r-- | Lib/urllib2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py index e990128..d7679fc 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) |