UTF-8 -> utf-8

Author: methane

Doc/glossary.rst

@@ -706,11 +706,11 @@ Glossary
 
    locale encoding
       On Unix, it is the encoding of the LC_CTYPE locale. It can be set with
-      ``locale.setlocale(locale.LC_CTYPE, new_locale)``.
+      :func:`locale.setlocale(locale.LC_CTYPE, new_locale) <locale.setlocale>`.
 
       On Windows, it is the ANSI code page (ex: ``"cp1252"``).
 
-      On Android and VxWorks, Python uses ``"UTF-8"`` as the locale encoding.
+      On Android and VxWorks, Python uses ``"utf-8"`` as the locale encoding.
 
       ``locale.getencoding()`` can be used to get the locale encoding.
 

Doc/library/locale.rst

@@ -327,7 +327,7 @@ The :mod:`locale` module defines the following exception and functions:
    is not necessary or desired, *do_setlocale* should be set to ``False``.
 
    On Android or if the :ref:`Python UTF-8 Mode <utf8-mode>` is enabled, always
-   return ``'UTF-8'``, the :term:`locale encoding` and the *do_setlocale*
+   return ``'utf-8'``, the :term:`locale encoding` and the *do_setlocale*
    argument are ignored.
 
    The :ref:`Python preinitialization <c-preinit>` configures the LC_CTYPE
@@ -337,18 +337,23 @@ The :mod:`locale` module defines the following exception and functions:
       The function now always returns ``"UTF-8"`` on Android or if the
       :ref:`Python UTF-8 Mode <utf8-mode>` is enabled.
 
+   .. versionchanged:: 3.11
+      The function now returns ``"utf-8"`` instead of ``"UTF-8"`` on Android
+      or if the :ref:`Python UTF-8 Mode <utf8-mode>` is enabled.
+
 
 .. function:: getencoding()
 
    Get the current :term:`locale encoding`:
 
-   * On Android and VxWorks, return ``"UTF-8"``.
+   * On Android and VxWorks, return ``"utf-8"``.
    * On Unix, return the encoding of the current :data:`LC_CTYPE` locale.
-     Return ``"UTF-8"`` if ``nl_langinfo(CODESET)`` returns an empty string:
+     Return ``"utf-8"`` if ``nl_langinfo(CODESET)`` returns an empty string:
      for example, if the current LC_CTYPE locale is not supported.
    * On Windows, return the ANSI code page.
 
-   This function is similar to :func:`getpreferredencoding(False) <getpreferredencoding>` except this
+   This function is similar to
+   :func:`getpreferredencoding(False) <getpreferredencoding>` except this
    function ignores the :ref:`Python UTF-8 Mode <utf8-mode>`.
 
    .. versionadded:: 3.11

Lib/locale.py

@@ -643,11 +643,11 @@ def getencoding():
         if hasattr(sys, 'getandroidapilevel'):
             # On Android langinfo.h and CODESET are missing, and UTF-8 is
             # always used in mbstowcs() and wcstombs().
-            return 'UTF-8'
+            return 'utf-8'
         encoding = getdefaultlocale()[1]
         if encoding is None:
             # LANG not set, default to UTF-8
-            encoding = 'UTF-8'
+            encoding = 'utf-8'
         return encoding
 
 try:
@@ -656,15 +656,15 @@ def getencoding():
     def getpreferredencoding(do_setlocale=True):
         """Return the charset that the user is likely using."""
         if sys.flags.utf8_mode:
-            return 'UTF-8'
+            return 'utf-8'
         return getencoding()
 else:
     # On Unix, if CODESET is available, use that.
     def getpreferredencoding(do_setlocale=True):
         """Return the charset that the user is likely using,
         according to the system configuration."""
         if sys.flags.utf8_mode:
-            return 'UTF-8'
+            return 'utf-8'
 
         if not do_setlocale:
             return getencoding()

Python/fileutils.c

@@ -95,9 +95,7 @@ _Py_device_encoding(int fd)
 #else
     if (_PyRuntime.preconfig.utf8_mode) {
         _Py_DECLARE_STR(utf_8, "utf-8");
-        PyObject *encoding = &_Py_STR(utf_8);
-        Py_INCREF(encoding);
-        return encoding;
+        return Py_NewRef(&_Py_STR(utf_8));
     }
     return _Py_GetLocaleEncodingObject();
 #endif
@@ -879,10 +877,10 @@ _Py_EncodeLocaleEx(const wchar_t *text, char **str,
 
 // Get the current locale encoding name:
 //
-// - Return "UTF-8" if _Py_FORCE_UTF8_LOCALE macro is defined (ex: on Android)
-// - Return "UTF-8" if the UTF-8 Mode is enabled
+// - Return "utf-8" if _Py_FORCE_UTF8_LOCALE macro is defined (ex: on Android)
+// - Return "utf-8" if the UTF-8 Mode is enabled
 // - On Windows, return the ANSI code page (ex: "cp1250")
-// - Return "UTF-8" if nl_langinfo(CODESET) returns an empty string.
+// - Return "utf-8" if nl_langinfo(CODESET) returns an empty string.
 // - Otherwise, return nl_langinfo(CODESET).
 //
 // Return NULL on memory allocation failure.
@@ -894,7 +892,7 @@ _Py_GetLocaleEncoding(void)
 #ifdef _Py_FORCE_UTF8_LOCALE
     // On Android langinfo.h and CODESET are missing,
     // and UTF-8 is always used in mbstowcs() and wcstombs().
-    return _PyMem_RawWcsdup(L"UTF-8");
+    return _PyMem_RawWcsdup(L"utf-8");
 #else
 
 #ifdef MS_WINDOWS
@@ -908,7 +906,7 @@ _Py_GetLocaleEncoding(void)
     if (!encoding || encoding[0] == '\0') {
         // Use UTF-8 if nl_langinfo() returns an empty string. It can happen on
         // macOS if the LC_CTYPE locale is not supported.
-        return _PyMem_RawWcsdup(L"UTF-8");
+        return _PyMem_RawWcsdup(L"utf-8");
     }
 
     wchar_t *wstr;

Python/initconfig.c

@@ -1781,7 +1781,7 @@ config_get_locale_encoding(PyConfig *config, const PyPreConfig *preconfig,
 {
     wchar_t *encoding;
     if (preconfig->utf8_mode) {
-        encoding = _PyMem_RawWcsdup(L"UTF-8");
+        encoding = _PyMem_RawWcsdup(L"utf-8");
     }
     else {
         encoding = _Py_GetLocaleEncoding();