Hopefully this makes test_urllib2 have inconsistent leak results

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index b363455221cddd00cd0526e8411c13bc8aa1527e..11090867507be642e82186ee68954b9a9ce2cb55 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -520,7 +520,7 @@ def runtest(test, generate, verbose, quiet, testdir=None, huntrleaks=False):
                 import gc
                 def cleanup():
                     import _strptime, linecache, warnings, dircache
-                    import urlparse, urllib, urllib2
+                    import urlparse, urllib, urllib2, mimetypes
                     from distutils.dir_util import _path_created
                     _path_created.clear()
                     warnings.filters[:] = fs
@@ -536,6 +536,7 @@ def runtest(test, generate, verbose, quiet, testdir=None, huntrleaks=False):
                     sys.path_importer_cache.update(pic)
                     dircache.reset()
                     linecache.clearcache()
+                    mimetypes._default_mime_types()
                 if indirect_test:
                     def run_the_test():
                         indirect_test()

diff --git a/Misc/build.sh b/Misc/build.sh
index d1372d64b6ca4507b1c02ed918e0f6c9e15e89f4..2c9540300701400c7006cbcf36403cecc06466fd 100755 (executable)
--- a/Misc/build.sh
+++ b/Misc/build.sh
@@ -60,7 +60,7 @@ REFLOG="build/reflog.txt.out"
 # Note: test_XXX (none currently) really leak, but are disabled
 # so we don't send spam.  Any test which really leaks should only 
 # be listed here if there are also test cases under Lib/test/leakers.
-LEAKY_TESTS="test_(capi|cfgparser|charmapcodec|cmd_line|compiler|ctypes|filecmp|quopri|socket|threaded_import|threadedtempfile|threading|threading_local|urllib2)"
+LEAKY_TESTS="test_(capi|cfgparser|charmapcodec|cmd_line|compiler|ctypes|filecmp|quopri|socket|threaded_import|threadedtempfile|threading|threading_local)"
 
 # Change this flag to "yes" for old releases to only update/build the docs.
 BUILD_DISABLED="no"