Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a)

Author: brettcannon

Lib/_dummy_thread.py

@@ -7,7 +7,7 @@
 
     try:
         import _thread
-    except ModuleNotFoundError:
+    except ImportError:
         import _dummy_thread as _thread
 
 """

Lib/_osx_support.py

@@ -62,7 +62,7 @@ def _read_output(commandstring):
     try:
         import tempfile
         fp = tempfile.NamedTemporaryFile()
-    except ModuleNotFoundError:
+    except ImportError:
         fp = open("/tmp/_osx_support.%s"%(
             os.getpid(),), "w+b")
 

Lib/_pyio.py

@@ -9,7 +9,7 @@
 # Import _thread instead of threading to reduce startup cost
 try:
     from _thread import allocate_lock as Lock
-except ModuleNotFoundError:
+except ImportError:
     from _dummy_thread import allocate_lock as Lock
 
 import io
@@ -1486,7 +1486,7 @@ def __init__(self, buffer, encoding=None, errors=None, newline=None,
             if encoding is None:
                 try:
                     import locale
-                except ModuleNotFoundError:
+                except ImportError:
                     # Importing locale may fail if Python is being built
                     encoding = "ascii"
                 else:

Lib/_strptime.py

@@ -21,7 +21,7 @@
                       timezone as datetime_timezone)
 try:
     from _thread import allocate_lock as _thread_allocate_lock
-except ModuleNotFoundError:
+except ImportError:
     from _dummy_thread import allocate_lock as _thread_allocate_lock
 
 __all__ = []

Lib/bisect.py

@@ -88,5 +88,5 @@ def bisect_left(a, x, lo=0, hi=None):
 # Overwrite above definitions with a fast C implementation
 try:
     from _bisect import *
-except ModuleNotFoundError:
+except ImportError:
     pass

Lib/bz2.py

@@ -14,7 +14,7 @@
 
 try:
     from threading import RLock
-except ModuleNotFoundError:
+except ImportError:
     from dummy_threading import RLock
 
 from _bz2 import BZ2Compressor, BZ2Decompressor

Lib/cmd.py

@@ -109,7 +109,7 @@ def cmdloop(self, intro=None):
                 self.old_completer = readline.get_completer()
                 readline.set_completer(self.complete)
                 readline.parse_and_bind(self.completekey+": complete")
-            except ModuleNotFoundError:
+            except ImportError:
                 pass
         try:
             if intro is not None:
@@ -143,7 +143,7 @@ def cmdloop(self, intro=None):
                 try:
                     import readline
                     readline.set_completer(self.old_completer)
-                except ModuleNotFoundError:
+                except ImportError:
                     pass
 
 

Lib/code.py

@@ -293,7 +293,7 @@ def interact(banner=None, readfunc=None, local=None):
     else:
         try:
             import readline
-        except ModuleNotFoundError:
+        except ImportError:
             pass
     console.interact(banner)
 

Lib/collections/__init__.py

@@ -395,7 +395,7 @@ def _count_elements(mapping, iterable):
 
 try:                                    # Load C helper function if available
     from _collections import _count_elements
-except ModuleNotFoundError:
+except ImportError:
     pass
 
 class Counter(dict):

Lib/copy.py

@@ -59,7 +59,7 @@ class Error(Exception):
 
 try:
     from org.python.core import PyStringMap
-except ModuleNotFoundError:
+except ImportError:
     PyStringMap = None
 
 __all__ = ["Error", "copy", "deepcopy"]