8000 bpo-47000: Add `locale.getencoding()` by methane · Pull Request #32068 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-47000: Add locale.getencoding() #32068

8000
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Apr 9, 2022
Merged

bpo-47000: Add locale.getencoding() #32068

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cd4bccc
bpo-47000: Add locale.get_encoding()
methane Mar 20, 2022
aaa8956
get_encoding() -> getencoding()
methane Mar 31, 2022
104206a
fix TextIOWrapper.__init__
methane Mar 31, 2022
8b50eb1
get_encoding -> getencoding
methane Mar 31, 2022
a0204c2
Use _Py_STR for "utf-8"
methane Apr 4, 2022
08413f1
Update the doc.
methane Apr 6, 2022
f61b622
Add news
methane Apr 6, 2022
1c60e5b
Apply proposed changes.
methane Apr 6, 2022
7397493
Fix doc error.
methane Apr 6, 2022
44730dd
Apply suggestions from code review
methane Apr 7, 2022
7720b10
UTF-8 -> utf-8
methane Apr 7, 2022
104008d
Fix test_utf8_mode
methane Apr 7, 2022
a8e50bd
Update based on suggestions
methane Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
get_encoding() -> getencoding()
  • Loading branch information
@methane
methane committed Apr 4, 2022
commit aaa89568fd9ea76c5fa5216f9dd1faeca7e5555f
6 changes: 3 additions & 3 deletions Lib/locale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"setlocale", "resetlocale", "localeconv", "strcoll", "strxfrm",
"str", "atof", "atoi", "format", "format_string", "currency",
"normalize", "LC_CTYPE", "LC_COLLATE", "LC_TIME", "LC_MONETARY",
"LC_NUMERIC", "LC_ALL", "CHAR_MAX", "get_encoding"]
"LC_NUMERIC", "LC_ALL", "CHAR_MAX", "getencoding"]

def _strcoll(a,b):
""" strcoll(string,string) -> int.
Expand Down Expand Up @@ -637,9 +637,9 @@ def resetlocale(category=LC_ALL):


try:
from _locale import get_encoding
from _locale import getencoding
except ImportError:
def get_encoding():
def getencoding():
if hasattr(sys, 'getandroidapilevel'):
# On Android langinfo.h and CODESET are missing, and UTF-8 is
# always used in mbstowcs() and wcstombs().
Expand Down
8 changes: 4 additions & 4 deletions Modules/_localemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,14 +773,14 @@ _locale_bind_textdomain_codeset_impl(PyObject *module, const char *domain,


/*[clinic input]
_locale.get_encoding
_locale.getencoding

Get the current locale encoding.
[clinic start generated code]*/

static PyObject *
_locale_get_encoding_impl(PyObject *module)
/*[clinic end generated code: output=7811932060493a1b input=163753befd041d95]*/
_locale_getencoding_impl(PyObject *module)
/*[clinic end generated code: output=86b326b971872e46 input=6503d11e5958b360]*/
{
return _Py_GetLocaleEncodingObject();
}
Expand Down Expand Up @@ -811,7 +811,7 @@ static struct PyMethodDef PyLocale_Methods[] = {
_LOCALE_BIND_TEXTDOMAIN_CODESET_METHODDEF
#endif
#endif
_LOCALE_GET_ENCODING_METHODDEF
_LOCALE_GETENCODING_METHODDEF
{NULL, NULL}
};

Expand Down
16 changes: 8 additions & 8 deletions Modules/clinic/_localemodule.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0