diff options
author | Brett Cannon <brett@python.org> | 2013-06-13 00:12:30 (GMT) |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2013-06-13 00:12:30 (GMT) |
commit | c9a1bfed5d820b681debca52554fea76ba0a9ae0 (patch) | |
tree | ba3c9fd41acbffaa32bf6e09a323471778064be7 /Lib/test/regrtest.py | |
parent | 603dcf27140ca109d11496eb4a57fe6440ddc915 (diff) | |
download | cpython-c9a1bfed5d820b681debca52554fea76ba0a9ae0.zip cpython-c9a1bfed5d820b681debca52554fea76ba0a9ae0.tar.gz cpython-c9a1bfed5d820b681debca52554fea76ba0a9ae0.tar.bz2 |
Move test___all__ over to unittest.main() and use 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 4c55db5..7602b2b 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -146,11 +146,11 @@ from inspect import isabstract try: import threading -except ImportError: +except ModuleNotFoundError: threading = None try: import multiprocessing.process -except ImportError: +except ModuleNotFoundError: multiprocessing = None @@ -180,7 +180,7 @@ for module in sys.modules.values(): if sys.platform == 'darwin': try: import resource - except ImportError: + except ModuleNotFoundError: pass else: soft, hard = resource.getrlimit(resource.RLIMIT_STACK) @@ -571,7 +571,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, if findleaks: try: import gc - except ImportError: + except ModuleNotFoundError: print('No GC available, disabling findleaks.') findleaks = False else: @@ -692,7 +692,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, if use_mp: try: from threading import Thread - except ImportError: + except ModuleNotFoundError: print("Multiprocess option requires thread support") sys.exit(2) from queue import Queue @@ -1396,7 +1396,7 @@ def dash_R(the_module, test, indirect_test, huntrleaks): pic = sys.path_importer_cache.copy() try: import zipimport - except ImportError: + except ModuleNotFoundError: zdc = None # Run unmodified on platforms without zipimport support else: zdc = zipimport._zip_directory_cache.copy() @@ -1473,7 +1473,7 @@ def dash_R_cleanup(fs, ps, pic, zdc, abcs): sys.path_importer_cache.update(pic) try: import zipimport - except ImportError: + except ModuleNotFoundError: pass # Run unmodified on platforms without zipimport support else: zipimport._zip_directory_cache.clear() @@ -1510,7 +1510,7 @@ def dash_R_cleanup(fs, ps, pic, zdc, abcs): doctest.master = None try: import ctypes - except ImportError: + except ModuleNotFoundError: # Don't worry about resetting the cache if ctypes is not supported pass else: |