diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/sys.rst | 4 | ||||
| -rw-r--r-- | Doc/c-api/unicode.rst | 8 | ||||
| -rw-r--r-- | Doc/library/sys.rst | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst index 0eee35a..c8ea783 100644 --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -108,7 +108,7 @@ Operating System Utilities Encoding, highest priority to lowest priority: - * ``UTF-8`` on macOS and Android; + * ``UTF-8`` on macOS, Android, and VxWorks; * ``UTF-8`` on Windows if :c:data:`Py_LegacyWindowsFSEncodingFlag` is zero; * ``UTF-8`` if the Python UTF-8 mode is enabled; * ``ASCII`` if the ``LC_CTYPE`` locale is ``"C"``, @@ -154,7 +154,7 @@ Operating System Utilities Encoding, highest priority to lowest priority: - * ``UTF-8`` on macOS and Android; + * ``UTF-8`` on macOS, Android, and VxWorks; * ``UTF-8`` on Windows if :c:data:`Py_LegacyWindowsFSEncodingFlag` is zero; * ``UTF-8`` if the Python UTF-8 mode is enabled; * ``ASCII`` if the ``LC_CTYPE`` locale is ``"C"``, diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 39c067d..97c5ebc 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -760,8 +760,8 @@ system. Py_ssize_t len, \ const char *errors) - Decode a string from UTF-8 on Android, or from the current locale encoding - on other platforms. The supported + Decode a string from UTF-8 on Android and VxWorks, or from the current + locale encoding on other platforms. The supported error handlers are ``"strict"`` and ``"surrogateescape"`` (:pep:`383`). The decoder uses ``"strict"`` error handler if *errors* is ``NULL``. *str* must end with a null character but @@ -796,8 +796,8 @@ system. .. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, const char *errors) - Encode a Unicode object to UTF-8 on Android, or to the current locale - encoding on other platforms. The + Encode a Unicode object to UTF-8 on Android and VxWorks, or to the current + locale encoding on other platforms. The supported error handlers are ``"strict"`` and ``"surrogateescape"`` (:pep:`383`). The encoder uses ``"strict"`` error handler if *errors* is ``NULL``. Return a :class:`bytes` object. *unicode* cannot diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 018f0c9..0fa5bd4 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -524,13 +524,17 @@ always available. * In the UTF-8 mode, the encoding is ``utf-8`` on any platform. - * On Mac OS X, the encoding is ``'utf-8'``. + * On macOS, the encoding is ``'utf-8'``. * On Unix, the encoding is the locale encoding. * On Windows, the encoding may be ``'utf-8'`` or ``'mbcs'``, depending on user configuration. + * On Android, the encoding is ``'utf-8'``. + + * On VxWorks, the encoding is ``'utf-8'``. + .. versionchanged:: 3.2 :func:`getfilesystemencoding` result cannot be ``None`` anymore. @@ -1023,7 +1027,7 @@ always available. Linux ``'linux'`` Windows ``'win32'`` Windows/Cygwin ``'cygwin'`` - Mac OS X ``'darwin'`` + macOS ``'darwin'`` ================ =========================== .. versionchanged:: 3.3 |