From: 莯凛 <34085039+mokurin000@users.noreply.github.com> Date: Fri, 27 Feb 2026 10:06:46 +0000 (+0800) Subject: gh-123853: Cleanup Windows 95 locale fallback support (#144738) X-Git-Tag: v3.15.0a7~136 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=171e0facc4131f74baec38f58fb0971c52ac2c8a;p=thirdparty%2FPython%2Fcpython.git gh-123853: Cleanup Windows 95 locale fallback support (#144738) Closes #123853 --- diff --git a/Lib/locale.py b/Lib/locale.py index dea3ee55cf4d..e7382796905e 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -570,10 +570,6 @@ def _getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')): except (ImportError, AttributeError): pass else: - # make sure the code/encoding values are valid - if sys.platform == "win32" and code and code[:2] == "0x": - # map windows language identifier to language name - code = windows_locale.get(int(code, 0)) # ...add other platform-specific processing here, if # necessary... return code, encoding diff --git a/Misc/NEWS.d/next/Library/2026-02-21-17-34-53.gh-issue-123853.6RUwWh.rst b/Misc/NEWS.d/next/Library/2026-02-21-17-34-53.gh-issue-123853.6RUwWh.rst new file mode 100644 index 000000000000..1babcbfd8e67 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-02-21-17-34-53.gh-issue-123853.6RUwWh.rst @@ -0,0 +1 @@ +Removed Windows 95 compatibility for :func:`locale.getdefaultlocale`. diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index f0a418ee5024..86a390e52a55 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -555,17 +555,6 @@ _locale__getdefaultlocale_impl(PyObject *module) return Py_BuildValue("ss", locale, encoding); } - /* If we end up here, this windows version didn't know about - ISO639/ISO3166 names (it's probably Windows 95). Return the - Windows language identifier instead (a hexadecimal number) */ - - locale[0] = '0'; - locale[1] = 'x'; - if (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTLANGUAGE, - locale+2, sizeof(locale)-2)) { - return Py_BuildValue("ss", locale, encoding); - } - /* cannot determine the language code (very unlikely) */ return Py_BuildValue("Os", Py_None, encoding); }