mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

4
Lib/pickle.py
View file

@ -90,7 +90,7 @@ class _Stop(Exception):
# Jython has PyStringMap; it's a dict subclass with string keys
try:
from org.python.core import PyStringMap
except ModuleNotFoundError:
except ImportError:
PyStringMap = None
# Pickle opcodes. See pickletools.py for extensive docs. The listing
@ -1296,7 +1296,7 @@ def loads(s, *, fix_imports=True, encoding="ASCII", errors="strict"):
# Use the faster _pickle if possible
try:
from _pickle import *
except ModuleNotFoundError:
except ImportError:
Pickler, Unpickler = _Pickler, _Unpickler
# Doctest