Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a)
diff --git a/Lib/platform.py b/Lib/platform.py
index 5951efb..c54f768 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -460,7 +460,7 @@
try:
# Use win32api if available
from win32api import RegQueryValueEx
- except ModuleNotFoundError:
+ except ImportError:
# On Python 2.0 and later, emulate using winreg
import winreg
RegQueryValueEx = winreg.QueryValueEx
@@ -503,7 +503,7 @@
RegCloseKey, GetVersionEx
from win32con import HKEY_LOCAL_MACHINE, VER_PLATFORM_WIN32_NT, \
VER_PLATFORM_WIN32_WINDOWS, VER_NT_WORKSTATION
- except ModuleNotFoundError:
+ except ImportError:
# Emulate the win32api module using Python APIs
try:
sys.getwindowsversion
@@ -661,7 +661,7 @@
# Check whether the version info module is available
try:
import _gestalt
- except ModuleNotFoundError:
+ except ImportError:
return None
# Get the infos
sysv, sysa = _mac_ver_lookup(('sysv','sysa'))
@@ -697,7 +697,7 @@
try:
import plistlib
- except ModuleNotFoundError:
+ except ImportError:
return None
pl = plistlib.readPlist(fn)
@@ -762,7 +762,7 @@
# Import the needed APIs
try:
import java.lang
- except ModuleNotFoundError:
+ except ImportError:
return release,vendor,vminfo,osinfo
vendor = _java_getprop('java.vendor', vendor)
@@ -874,7 +874,7 @@
"""
try:
import socket
- except ModuleNotFoundError:
+ except ImportError:
# No sockets...
return default
try:
@@ -1138,7 +1138,7 @@
# Get processor information
try:
import vms_lib
- except ModuleNotFoundError:
+ except ImportError:
pass
else:
csid, cpu_number = vms_lib.getsyi('SYI$_CPU',0)