From 7070094d7ffd4308e12188b39d0f346473581335 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Thu, 24 Jan 2008 07:40:51 +0000 Subject: 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. --- Lib/urllib2.py | 4 ++-- 1 file 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) -- cgit v0.12