Commit21e9de3

authored

gh-103085: Fix python locale.getencoding not to emit deprecation warning (gh-103086)

1 parentfda95aa commit21e9de3Copy full SHA for 21e9de3

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,9 @@ def getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')):`
`545`	`545`	`"Use setlocale(), getencoding() and getlocale() instead",`
`546`	`546`	`DeprecationWarning,stacklevel=2`
`547`	`547`	`)`
	`548`	`+return_getdefaultlocale(envvars)`
`548`	`549`
	`550`	`+def_getdefaultlocale(envvars=('LC_ALL','LC_CTYPE','LANG','LANGUAGE')):`
`549`	`551`	`try:`
`550`	`552`	`# check if it's supported by the _locale module`
`551`	`553`	`import_locale`
`@@ -639,7 +641,7 @@ def getencoding():`
`639`	`641`	`# On Android langinfo.h and CODESET are missing, and UTF-8 is`
`640`	`642`	`# always used in mbstowcs() and wcstombs().`
`641`	`643`	`return'utf-8'`
`642`		`-encoding=getdefaultlocale()[1]`
	`644`	`+encoding=_getdefaultlocale()[1]`
`643`	`645`	`ifencodingisNone:`
`644`	`646`	`# LANG not set, default to UTF-8`
`645`	`647`	`encoding='utf-8'`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Pure python:func:`locale.getencoding()` will not warn deprecation.

Comments

(0)