diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-07 16:31:52 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-07 16:31:52 (GMT) |
| commit | fe8f4c9e87699acfd740dfc38ae5320691598250 (patch) | |
| tree | f911eda95b3418157c21165ec6870b11af8d7a78 | |
| parent | 2f8bfef1587b3e8f43c0ce7cd9546137c5b56782 (diff) | |
| download | cpython-fe8f4c9e87699acfd740dfc38ae5320691598250.zip cpython-fe8f4c9e87699acfd740dfc38ae5320691598250.tar.gz cpython-fe8f4c9e87699acfd740dfc38ae5320691598250.tar.bz2 | |
Issue #27959: Prevent ImportError from escaping codec search function
| -rw-r--r-- | Lib/encodings/__init__.py | 12 | ||||
| -rw-r--r-- | Lib/test/test_io.py | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index 9a9b90b..ca07881 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -155,9 +155,13 @@ codecs.register(search_function) if sys.platform == 'win32': def _alias_mbcs(encoding): - import _bootlocale - if encoding == _bootlocale.getpreferredencoding(False): - import encodings.mbcs - return encodings.mbcs.getregentry() + try: + import _bootlocale + if encoding == _bootlocale.getpreferredencoding(False): + import encodings.mbcs + return encodings.mbcs.getregentry() + except ImportError: + # Imports may fail while we are shutting down + pass codecs.register(_alias_mbcs) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index f9f5d7a..c48ec3a 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3230,8 +3230,7 @@ def _to_memoryview(buf): class CTextIOWrapperTest(TextIOWrapperTest): io = io - shutdown_error = ("ImportError: sys.meta_path is None" - if os.name == "nt" else "RuntimeError: could not find io module state") + shutdown_error = "RuntimeError: could not find io module state" def test_initialization(self): r = self.BytesIO(b"\xc3\xa9\n\n") |