mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-01 07:19:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix the test_urllib2net failures that were caused by r58067.

Browse source 
I'm not sure this is the correct fix, but at least the test passes
now and should be closer to correct.
This commit is contained in:
Neal Norwitz 2008-01-24 07:40:51 +00:00
parent bf839e2efa
commit 7070094d7f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/urllib2.py
View file

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