[Python-checkins] cpython (merge 3.3 -> default): merge 3.3
benjamin.peterson
python-checkins at python.org
Sun Feb 16 20:54:08 CET 2014
http://hg.python.org/cpython/rev/9487c290e088
changeset: 89228:9487c290e088
parent: 89222:52ab9e1ff46a
parent: 89227:478523c1aafc
user: Benjamin Peterson <benjamin at python.org>
date: Sun Feb 16 14:53:55 2014 -0500
summary:
merge 3.3
files:
Lib/test/regrtest.py | 9 +++------
Lib/test/test_pkgutil.py | 5 +++++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1373,10 +1373,9 @@
try:
import zipimport
except ImportError:
- zsc = zdc = None # Run unmodified on platforms without zipimport support
+ zdc = None # Run unmodified on platforms without zipimport support
else:
zdc = zipimport._zip_directory_cache.copy()
- zsc = zipimport._zip_stat_cache.copy()
abcs = {}
for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]:
if not isabstract(abc):
@@ -1395,7 +1394,7 @@
sys.stderr.flush()
for i in range(repcount):
indirect_test()
- alloc_after, rc_after = dash_R_cleanup(fs, ps, pic, zdc, zsc, abcs)
+ alloc_after, rc_after = dash_R_cleanup(fs, ps, pic, zdc, abcs)
sys.stderr.write('.')
sys.stderr.flush()
if i >= nwarmup:
@@ -1429,7 +1428,7 @@
failed = True
return failed
-def dash_R_cleanup(fs, ps, pic, zdc, zsc, abcs):
+def dash_R_cleanup(fs, ps, pic, zdc, abcs):
import gc, copyreg
import _strptime, linecache
import urllib.parse, urllib.request, mimetypes, doctest
@@ -1455,8 +1454,6 @@
else:
zipimport._zip_directory_cache.clear()
zipimport._zip_directory_cache.update(zdc)
- zipimport._zip_stat_cache.clear()
- zipimport._zip_stat_cache.update(zsc)
# clear type cache
sys._clear_type_cache()
diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py
--- a/Lib/test/test_pkgutil.py
+++ b/Lib/test/test_pkgutil.py
@@ -349,6 +349,11 @@
def test_main():
run_unittest(PkgutilTests, PkgutilPEP302Tests, ExtendPathTests,
NestedNamespacePackageTest, ImportlibMigrationTests)
+ # this is necessary if test is run repeated (like when finding leaks)
+ import zipimport
+ import importlib
+ zipimport._zip_directory_cache.clear()
+ importlib.invalidate_caches()
if __name__ == '__main__':
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list