commit 0a140668faf18bf7f8d2ea15e57da5e2a0625292
author Brett Cannon <brett@python.org> Thu Jun 13 20:57:26 2013 -0400
committer Brett Cannon <brett@python.org> Thu Jun 13 20:57:26 2013 -0400
tree 97522129bc600a6eff09899ae7a177b5f3e980b3
parent 9702a17a6ab90d026449dd20631a6f380d007b3d

Issue #18200: Update the stdlib (except tests) to use
ModuleNotFoundError.

Lib/shutil.py

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 6879d8b..9d1a466 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -17,17 +17,17 @@
     import bz2
     del bz2
     _BZ2_SUPPORTED = True
-except ImportError:
+except ModuleNotFoundError:
     _BZ2_SUPPORTED = False
 
 try:
     from pwd import getpwnam
-except ImportError:
+except ModuleNotFoundError:
     getpwnam = None
 
 try:
     from grp import getgrnam
-except ImportError:
+except ModuleNotFoundError:
     getgrnam = None
 
 __all__ = ["copyfileobj", "copyfile", "copymode", "copystat", "copy", "copy2",
@@ -668,7 +668,7 @@
     # command.
     try:
         import zipfile
-    except ImportError:
+    except ModuleNotFoundError:
         zipfile = None
 
     if zipfile is None:
@@ -858,7 +858,7 @@
     """
     try:
         import zipfile
-    except ImportError:
+    except ModuleNotFoundError:
         raise ReadError('zlib not supported, cannot unpack this archive.')
 
     if not zipfile.is_zipfile(filename):