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

This commit is contained in:
Brett Cannon 2013-07-04 17:43:24 -04:00
parent fff59155d4
commit cd171c8e92
83 changed files with 158 additions and 144 deletions

View file

@ -149,7 +149,7 @@ import sys
try:
from collections import namedtuple as _namedtuple
DecimalTuple = _namedtuple('DecimalTuple', 'sign digits exponent')
except ModuleNotFoundError:
except ImportError:
DecimalTuple = lambda *args: args
# Rounding
@ -430,7 +430,7 @@ _rounding_modes = (ROUND_DOWN, ROUND_HALF_UP, ROUND_HALF_EVEN, ROUND_CEILING,
try:
import threading
except ModuleNotFoundError:
except ImportError:
# Python was compiled without threads; create a mock object instead
class MockThreading(object):
def local(self, sys=sys):
@ -6147,7 +6147,7 @@ del re
# don't care too much if locale isn't present.
try:
import locale as _locale
except ModuleNotFoundError:
except ImportError:
pass
def _parse_format_specifier(format_spec, _localeconv=None):
@ -6391,7 +6391,7 @@ del sys
try:
import _decimal
except ModuleNotFoundError:
except ImportError:
pass
else:
s1 = set(dir())