From 833a8d86417f4832f5e3ad742f21fe10378388bb Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 24 Aug 2001 13:10:13 +0000 Subject: [PATCH] =?utf8?q?SF=20patch=20#454553=20by=20Walter=20D=C3=B6rwal?= =?utf8?q?d:=20add=20content-type=20to=20FTP=20URLs,=20like=20for=20urllib?= =?utf8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Lib/urllib2.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Lib/urllib2.py b/Lib/urllib2.py index f9e6bf254f..5882de6c45 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -956,11 +956,14 @@ class FTPHandler(BaseHandler): value in ('a', 'A', 'i', 'I', 'd', 'D'): type = value.upper() 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: - sf = StringIO('Content-Length: %d\n' % retrlen) - headers = mimetools.Message(sf) - else: - headers = noheaders() + headers += "Content-Length: %d\n" % retrlen + sf = StringIO(headers) + headers = mimetools.Message(sf) return addinfourl(fp, headers, req.get_full_url()) except ftplib.all_errors, msg: raise IOError, ('ftp error', msg), sys.exc_info()[2] -- 2.50.1