Issue #28596: The preferred encoding is UTF-8 on Android.
This commit is contained in:
parent
b06cde61a2
commit
6c9dcda6b4
|
@ -14,11 +14,17 @@ else:
|
|||
try:
|
||||
_locale.CODESET
|
||||
except AttributeError:
|
||||
def getpreferredencoding(do_setlocale=True):
|
||||
# This path for legacy systems needs the more complex
|
||||
# getdefaultlocale() function, import the full locale module.
|
||||
import locale
|
||||
return locale.getpreferredencoding(do_setlocale)
|
||||
if hasattr(sys, 'getandroidapilevel'):
|
||||
# On Android langinfo.h and CODESET are missing, and UTF-8 is
|
||||
# always used in mbstowcs() and wcstombs().
|
||||
def getpreferredencoding(do_setlocale=True):
|
||||
return 'UTF-8'
|
||||
else:
|
||||
def getpreferredencoding(do_setlocale=True):
|
||||
# This path for legacy systems needs the more complex
|
||||
# getdefaultlocale() function, import the full locale module.
|
||||
import locale
|
||||
return locale.getpreferredencoding(do_setlocale)
|
||||
else:
|
||||
def getpreferredencoding(do_setlocale=True):
|
||||
assert not do_setlocale
|
||||
|
|
|
@ -618,15 +618,21 @@ else:
|
|||
try:
|
||||
CODESET
|
||||
except NameError:
|
||||
# Fall back to parsing environment variables :-(
|
||||
def getpreferredencoding(do_setlocale = True):
|
||||
"""Return the charset that the user is likely using,
|
||||
by looking at environment variables."""
|
||||
res = getdefaultlocale()[1]
|
||||
if res is None:
|
||||
# LANG not set, default conservatively to ASCII
|
||||
res = 'ascii'
|
||||
return res
|
||||
if hasattr(sys, 'getandroidapilevel'):
|
||||
# On Android langinfo.h and CODESET are missing, and UTF-8 is
|
||||
# always used in mbstowcs() and wcstombs().
|
||||
def getpreferredencoding(do_setlocale = True):
|
||||
return 'UTF-8'
|
||||
else:
|
||||
# Fall back to parsing environment variables :-(
|
||||
def getpreferredencoding(do_setlocale = True):
|
||||
"""Return the charset that the user is likely using,
|
||||
by looking at environment variables."""
|
||||
res = getdefaultlocale()[1]
|
||||
if res is None:
|
||||
# LANG not set, default conservatively to ASCII
|
||||
res = 'ascii'
|
||||
return res
|
||||
else:
|
||||
def getpreferredencoding(do_setlocale = True):
|
||||
"""Return the charset that the user is likely using,
|
||||
|
|
|
@ -13,6 +13,9 @@ Core and Builtins
|
|||
- Issue #18896: Python function can now have more than 255 parameters.
|
||||
collections.namedtuple() now supports tuples with more than 255 elements.
|
||||
|
||||
- Issue #28596: The preferred encoding is UTF-8 on Android. Patch written by
|
||||
Chi Hsuan Yen.
|
||||
|
||||
- Issue #26919: On Android, operating system data is now always encoded/decoded
|
||||
to/from UTF-8, instead of the locale encoding to avoid inconsistencies with
|
||||
os.fsencode() and os.fsdecode() which are already using UTF-8.
|
||||
|
|
Loading…
Reference in New Issue