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
|
@ -9,7 +9,7 @@ import errno
|
|||
# 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 @@ class TextIOWrapper(TextIOBase):
|
|||
if encoding is None:
|
||||
try:
|
||||
import locale
|
||||
except ModuleNotFoundError:
|
||||
except ImportError:
|
||||
# Importing locale may fail if Python is being built
|
||||
encoding = "ascii"
|
||||
else:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue