Move test___all__ over to unittest.main() and use ModuleNotFoundError
diff --git a/Lib/test/support.py b/Lib/test/support.py
index 97de608..9baedb4 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -29,27 +29,27 @@
try:
import _thread, threading
-except ImportError:
+except ModuleNotFoundError:
_thread = None
threading = None
try:
import multiprocessing.process
-except ImportError:
+except ModuleNotFoundError:
multiprocessing = None
try:
import zlib
-except ImportError:
+except ModuleNotFoundError:
zlib = None
try:
import bz2
-except ImportError:
+except ModuleNotFoundError:
bz2 = None
try:
import lzma
-except ImportError:
+except ModuleNotFoundError:
lzma = None
__all__ = [
@@ -116,7 +116,7 @@
with _ignore_deprecated_imports(deprecated):
try:
return importlib.import_module(name)
- except ImportError as msg:
+ except ModuleNotFoundError as msg:
if sys.platform.startswith(tuple(required_on)):
raise
raise unittest.SkipTest(str(msg))
@@ -188,7 +188,7 @@
if not _save_and_block_module(blocked_name, orig_modules):
names_to_remove.append(blocked_name)
fresh_module = importlib.import_module(name)
- except ImportError:
+ except ModuleNotFoundError:
fresh_module = None
finally:
for orig_name, module in orig_modules.items():