diff options
author | Brett Cannon <brett@python.org> | 2013-07-04 21:43:24 (GMT) |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2013-07-04 21:43:24 (GMT) |
commit | cd171c8e92c10d327151400fd8f16b11a4964615 (patch) | |
tree | db734100511572201a54a6b7ce1803bcea4c94da /Lib/json | |
parent | fff59155d40ede93594eb77f320e0bde658cce28 (diff) | |
download | cpython-cd171c8e92c10d327151400fd8f16b11a4964615.zip cpython-cd171c8e92c10d327151400fd8f16b11a4964615.tar.gz cpython-cd171c8e92c10d327151400fd8f16b11a4964615.tar.bz2 |
Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a)
Diffstat (limited to 'Lib/json')
-rw-r--r-- | Lib/json/decoder.py | 2 | ||||
-rw-r--r-- | Lib/json/encoder.py | 4 | ||||
-rw-r--r-- | Lib/json/scanner.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py index 4f11354..da7ef9c 100644 --- a/Lib/json/decoder.py +++ b/Lib/json/decoder.py @@ -5,7 +5,7 @@ import re from json import scanner try: from _json import scanstring as c_scanstring -except ModuleNotFoundError: +except ImportError: c_scanstring = None __all__ = ['JSONDecoder'] diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py index 3fa90bd..39b550d 100644 --- a/Lib/json/encoder.py +++ b/Lib/json/encoder.py @@ -4,11 +4,11 @@ import re try: from _json import encode_basestring_ascii as c_encode_basestring_ascii -except ModuleNotFoundError: +except ImportError: c_encode_basestring_ascii = None try: from _json import make_encoder as c_make_encoder -except ModuleNotFoundError: +except ImportError: c_make_encoder = None ESCAPE = re.compile(r'[\x00-\x1f\\"\b\f\n\r\t]') diff --git a/Lib/json/scanner.py b/Lib/json/scanner.py index 761ade3..86426cd 100644 --- a/Lib/json/scanner.py +++ b/Lib/json/scanner.py @@ -3,7 +3,7 @@ import re try: from _json import make_scanner as c_make_scanner -except ModuleNotFoundError: +except ImportError: c_make_scanner = None __all__ = ['make_scanner'] |