[Python-checkins] r46955 - in python/trunk: Lib/SimpleHTTPServer.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Wed Jun 14 10:50:03 2006
New Revision: 46955

Modified:
   python/trunk/Lib/SimpleHTTPServer.py
   python/trunk/Misc/NEWS
Log:
Bug #1117556: SimpleHTTPServer now tries to find and use the system's
mime.types file for determining MIME types.


Modified: python/trunk/Lib/SimpleHTTPServer.py
==============================================================================
--- python/trunk/Lib/SimpleHTTPServer.py	(original)
+++ python/trunk/Lib/SimpleHTTPServer.py	Wed Jun 14 10:50:03 2006
@@ -191,7 +191,9 @@
             return self.extensions_map[ext]
         else:
             return self.extensions_map['']
-
+    
+    if not mimetypes.inited:
+        mimetypes.init() # try to read system mime.types
     extensions_map = mimetypes.types_map.copy()
     extensions_map.update({
         '': 'application/octet-stream', # Default

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Wed Jun 14 10:50:03 2006
@@ -156,6 +156,9 @@
 Library
 -------
 
+- Bug #1117556: SimpleHTTPServer now tries to find and use the system's
+  mime.types file for determining MIME types.
+
 - Bug #1339007: Shelf objects now don't raise an exception in their
   __del__ method when initialization failed.