[Python-checkins] CVS: python/dist/src/Lib urllib2.py,1.19,1.20

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv31967

Modified Files:
	urllib2.py 
Log Message:
SF patch #454553 by Walter Dörwald: add content-type to FTP URLs, like
for urllib.


Index: urllib2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** urllib2.py	2001/08/11 21:44:46	1.19
--- urllib2.py	2001/08/24 13:10:13	1.20
***************
*** 957,965 ****
                      type = value.upper()
              fp, retrlen = fw.retrfile(file, type)
              if retrlen is not None and retrlen >= 0:
!                 sf = StringIO('Content-Length: %d\n' % retrlen)
!                 headers = mimetools.Message(sf)
!             else:
!                 headers = noheaders()
              return addinfourl(fp, headers, req.get_full_url())
          except ftplib.all_errors, msg:
--- 957,968 ----
                      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:
!                 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: