diff options
| author | Brett Cannon <brett@python.org> | 2013-07-04 22:16:15 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2013-07-04 22:16:15 (GMT) |
| commit | 260fbe80c5bd3611ae9e896a3c4714527667aece (patch) | |
| tree | aa4e3e522edf2af312a256702b8f43769faab2e0 /Lib/test/regrtest.py | |
| parent | 3dfd23245be19ff95cf50fe93c428dabf2ff90e7 (diff) | |
| download | cpython-260fbe80c5bd3611ae9e896a3c4714527667aece.zip cpython-260fbe80c5bd3611ae9e896a3c4714527667aece.tar.gz cpython-260fbe80c5bd3611ae9e896a3c4714527667aece.tar.bz2 | |
Issue #15767: Excise the remaining instances of ModuleNotFoundError
Diffstat (limited to 'Lib/test/regrtest.py')
| -rwxr-xr-x | Lib/test/regrtest.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index bd816dd..aad0c62 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -146,11 +146,11 @@ from inspect import isabstract try: import threading -except ModuleNotFoundError: +except ImportError: threading = None try: import multiprocessing.process -except ModuleNotFoundError: +except ImportError: multiprocessing = None @@ -180,7 +180,7 @@ for module in sys.modules.values(): if sys.platform == 'darwin': try: import resource - except ModuleNotFoundError: + except ImportError: pass else: soft, hard = resource.getrlimit(resource.RLIMIT_STACK) @@ -567,7 +567,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, if findleaks: try: import gc - except ModuleNotFoundError: + except ImportError: print('No GC available, disabling findleaks.') findleaks = False else: @@ -688,7 +688,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, if use_mp: try: from threading import Thread - except ModuleNotFoundError: + except ImportError: print("Multiprocess option requires thread support") sys.exit(2) from queue import Queue @@ -1399,7 +1399,7 @@ def dash_R(the_module, test, indirect_test, huntrleaks): pic = sys.path_importer_cache.copy() try: import zipimport - except ModuleNotFoundError: + except ImportError: zdc = None # Run unmodified on platforms without zipimport support else: zdc = zipimport._zip_directory_cache.copy() @@ -1476,7 +1476,7 @@ def dash_R_cleanup(fs, ps, pic, zdc, abcs): sys.path_importer_cache.update(pic) try: import zipimport - except ModuleNotFoundError: + except ImportError: pass # Run unmodified on platforms without zipimport support else: zipimport._zip_directory_cache.clear() @@ -1513,7 +1513,7 @@ def dash_R_cleanup(fs, ps, pic, zdc, abcs): doctest.master = None try: import ctypes - except ModuleNotFoundError: + except ImportError: # Don't worry about resetting the cache if ctypes is not supported pass else: |