1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SF patch #454553 by Walter Dörwald: add content-type to FTP URLs, like

Browse Source 
for urllib.
This commit is contained in:
Guido van Rossum 2001-08-24 13:10:13 +00:00
parent 845fc48bf7
commit 833a8d8641
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/urllib2.py
View File

@ -956,11 +956,14 @@ class FTPHandler(BaseHandler):
value in ('a', 'A', 'i', 'I', 'd', 'D'): value in ('a', 'A', 'i', 'I', 'd', 'D'):
type = value.upper() type = value.upper()
fp, retrlen = fw.retrfile(file, type) fp, retrlen = fw.retrfile(file, type)
headers = ""
mtype = mimetypes.guess_type(req.get_full_url())[0]
if mtype:
headers += "Content-Type: %s\n" % mtype
if retrlen is not None and retrlen >= 0: if retrlen is not None and retrlen >= 0:
sf = StringIO('Content-Length: %d\n' % retrlen) headers += "Content-Length: %d\n" % retrlen
sf = StringIO(headers)
headers = mimetools.Message(sf) headers = mimetools.Message(sf)
else:
headers = noheaders()
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 IOError, ('ftp error', msg), sys.exc_info()[2] raise IOError, ('ftp error', msg), sys.exc_info()[2]