mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
Lib/warnings.py
View file

@ -144,8 +144,8 @@ def _getcategory(category):
module = category[:i]
klass = category[i+1:]
try:
m = __import__(module, fromlist[klass])
except ModuleNotFoundError:
m = __import__(module, None, None, [klass])
except ImportError:
raise _OptionError("invalid module name: %r" % (module,))
try:
cat = getattr(m, klass)
@ -362,7 +362,7 @@ try:
defaultaction = _defaultaction
onceregistry = _onceregistry
_warnings_defaults = True
except ModuleNotFoundError:
except ImportError:
filters = []
defaultaction = "default"
onceregistry = {}