diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2008-01-24 07:40:51 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2008-01-24 07:40:51 (GMT) |
| commit | 7070094d7ffd4308e12188b39d0f346473581335 (patch) | |
| tree | 3318e9481127aa1ea504c4f939ea8ce35026f5f8 | |
| parent | bf839e2efa78a4668105846c4d406f968343bff4 (diff) | |
| download | cpython-7070094d7ffd4308e12188b39d0f346473581335.zip cpython-7070094d7ffd4308e12188b39d0f346473581335.tar.gz cpython-7070094d7ffd4308e12188b39d0f346473581335.tar.bz2 | |
Fix the test_urllib2net failures that were caused by r58067.
I'm not sure this is the correct fix, but at least the test passes
now and should be closer to correct.
| -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 5a6f499..8bf0884 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -1246,7 +1246,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 @@ -1292,7 +1292,7 @@ class FTPHandler(BaseHandler): headers = mimetools.Message(sf) return addinfourl(fp, headers, req.get_full_url()) except ftplib.all_errors, msg: - raise URLError, ('ftp error', msg), sys.exc_info()[2] + raise URLError, ('ftp error: %s' % msg), sys.exc_info()[2] def connect_ftp(self, user, passwd, host, port, dirs, timeout): fw = ftpwrapper(user, passwd, host, port, dirs, timeout) |