Fix for failure of test_urllib2 breaking test_mimetypes (SF bug 1464978)

will backport.

Lib/mimetypes.py

@@ -315,23 +315,29 @@ def read_mime_types(file):
     return db.types_map[True]
 
 
-suffix_map = {
+def _default_mime_types():
+    global suffix_map
+    global encodings_map
+    global types_map
+    global common_types
+
+    suffix_map = {
         '.tgz': '.tar.gz',
         '.taz': '.tar.gz',
         '.tz': '.tar.gz',
         }
 
-encodings_map = {
+    encodings_map = {
         '.gz': 'gzip',
         '.Z': 'compress',
         }
 
-# Before adding new types, make sure they are either registered with IANA, at
-# http://www.isi.edu/in-notes/iana/assignments/media-types
-# or extensions, i.e. using the x- prefix
+    # Before adding new types, make sure they are either registered with IANA, 
+    # at http://www.isi.edu/in-notes/iana/assignments/media-types
+    # or extensions, i.e. using the x- prefix
 
-# If you add to these, please keep them sorted!
-types_map = {
+    # If you add to these, please keep them sorted!
+    types_map = {
         '.a'      : 'application/octet-stream',
         '.ai'     : 'application/postscript',
         '.aif'    : 'audio/x-aiff',
@@ -457,11 +463,11 @@ types_map = {
         '.zip'    : 'application/zip',
         }
 
-# These are non-standard types, commonly found in the wild.  They will only
-# match if strict=0 flag is given to the API methods.
+    # These are non-standard types, commonly found in the wild.  They will 
+    # only match if strict=0 flag is given to the API methods.
 
-# Please sort these too
-common_types = {
+    # Please sort these too
+    common_types = {
         '.jpg' : 'image/jpg',
         '.mid' : 'audio/midi',
         '.midi': 'audio/midi',
@@ -473,6 +479,9 @@ common_types = {
         }
 
 
+_default_mime_types()
+
+
 if __name__ == '__main__':
     import sys
     import getopt

Lib/test/test_mimetypes.py

@@ -8,6 +8,7 @@ from test import test_support
 # Tell it we don't know about external files:
 mimetypes.knownfiles = []
 mimetypes.inited = False
+mimetypes._default_mime_types()
 
 
 class MimeTypesTestCase(unittest.TestCase):