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

Issue #27959: Prevent ImportError from escaping codec search function

Browse source
This commit is contained in:
Steve Dower 2016-09-07 09:31:52 -07:00
parent 2f8bfef158
commit fe8f4c9e87
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/encodings/__init__.py
View file

@ -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)