Cleanup a bit more references so test_urllibnet is stable (test_urllib2 is sometimes stable, at least in isolation)
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 71dc291..e27f1e3 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -490,8 +490,8 @@
pic = sys.path_importer_cache.copy()
import gc
def cleanup():
- import _strptime, urlparse, warnings, dircache
- import linecache
+ import _strptime, linecache, warnings, dircache
+ import urlparse, urllib, urllib2
from distutils.dir_util import _path_created
_path_created.clear()
warnings.filters[:] = fs
@@ -499,6 +499,8 @@
sre.purge()
_strptime._regex_cache.clear()
urlparse.clear_cache()
+ urllib.urlcleanup()
+ urllib2.install_opener(None)
copy_reg.dispatch_table.clear()
copy_reg.dispatch_table.update(ps)
sys.path_importer_cache.clear()