Commit dc8c923f authored by Neal Norwitz's avatar Neal Norwitz

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.
parent 690fbeff
...@@ -1246,7 +1246,7 @@ class FTPHandler(BaseHandler): ...@@ -1246,7 +1246,7 @@ class FTPHandler(BaseHandler):
import mimetypes import mimetypes
host = req.get_host() host = req.get_host()
if not host: if not host:
raise URLError, ('ftp error', 'no host given') raise URLError('ftp error: no host given')
host, port = splitport(host) host, port = splitport(host)
if port is None: if port is None:
port = ftplib.FTP_PORT port = ftplib.FTP_PORT
...@@ -1292,7 +1292,7 @@ class FTPHandler(BaseHandler): ...@@ -1292,7 +1292,7 @@ class FTPHandler(BaseHandler):
headers = mimetools.Message(sf) headers = mimetools.Message(sf)
return addinfourl(fp, headers, req.get_full_url()) return addinfourl(fp, headers, req.get_full_url())
except ftplib.all_errors, msg: 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): def connect_ftp(self, user, passwd, host, port, dirs, timeout):
fw = ftpwrapper(user, passwd, host, port, dirs, timeout) fw = ftpwrapper(user, passwd, host, port, dirs, timeout)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment