mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a)
This commit is contained in:
parent
fff59155d4
commit
cd171c8e92
83 changed files with 158 additions and 144 deletions
|
@ -566,7 +566,7 @@ def normpath(path):
|
|||
try:
|
||||
from nt import _getfullpathname
|
||||
|
||||
except ModuleNotFoundError: # not running on Windows - mock up something sensible
|
||||
except ImportError: # not running on Windows - mock up something sensible
|
||||
def abspath(path):
|
||||
"""Return the absolute version of a path."""
|
||||
if not isabs(path):
|
||||
|
@ -659,6 +659,6 @@ try:
|
|||
# This is overkill on Windows - just pass the path to GetFileAttributes
|
||||
# and check the attribute from there.
|
||||
from nt import _isdir as isdir
|
||||
except ModuleNotFoundError:
|
||||
except ImportError:
|
||||
# Use genericpath.isdir as imported above.
|
||||
pass
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue