cpython: 75fe67538905 (original) (raw)

--- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -685,8 +685,8 @@ 3.x, but need to be aware that their use string content has been filled before using any of the access macros such as :c:func:PyUnicode_KIND.

• Please migrate to using :c:func:PyUnicode_FromKindAndData or
• :c:func:PyUnicode_New.

• Please migrate to using :c:func:PyUnicode_FromKindAndData,
• :c:func:PyUnicode_FromWideChar or :c:func:PyUnicode_New.

.. c:function:: Py_UNICODE* PyUnicode_AsUnicode(PyObject *unicode) @@ -700,7 +700,7 @@ 3.x, but need to be aware that their use used in most C functions. Please migrate to using :c:func:PyUnicode_AsUCS4,

• :c:func:PyUnicode_Substring, :c:func:PyUnicode_ReadChar or similar new

• :c:func:PyUnicode_AsWideChar, :c:func:PyUnicode_ReadChar or similar new APIs.

@@ -1086,7 +1086,8 @@ These are the UTF-8 codec APIs: .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:Py_UNICODE API; please migrate to using

•  :c:func:`PyUnicode_AsUTF8String` or :c:func:`PyUnicode_AsUTF8AndSize`.[](#l1.27)

•  :c:func:`PyUnicode_AsUTF8String`, :c:func:`PyUnicode_AsUTF8AndSize` or[](#l1.28)

•  :c:func:`PyUnicode_AsEncodedString`.[](#l1.29)

UTF-32 Codecs @@ -1159,7 +1160,7 @@ These are the UTF-32 codec APIs: .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:Py_UNICODE API; please migrate to using

•  :c:func:`PyUnicode_AsUTF32String`.[](#l1.37)

•  :c:func:`PyUnicode_AsUTF32String` or :c:func:`PyUnicode_AsEncodedString`.[](#l1.38)

UTF-16 Codecs @@ -1234,7 +1235,7 @@ These are the UTF-16 codec APIs: .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:Py_UNICODE API; please migrate to using

•  :c:func:`PyUnicode_AsUTF16String`.[](#l1.46)

•  :c:func:`PyUnicode_AsUTF16String` or :c:func:`PyUnicode_AsEncodedString`.[](#l1.47)

UTF-7 Codecs @@ -1271,9 +1272,8 @@ These are the UTF-7 codec APIs: Python "utf-7" codec. .. deprecated-removed:: 3.3 4.0

•  Part of the old-style :c:type:`Py_UNICODE` API.[](#l1.55)

-

• .. XXX replace with what?

•  Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using[](#l1.58)

•  :c:func:`PyUnicode_AsEncodedString`.[](#l1.59)

Unicode-Escape Codecs @@ -1336,7 +1336,8 @@ These are the "Raw Unicode Escape" codec .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:Py_UNICODE API; please migrate to using

•  :c:func:`PyUnicode_AsRawUnicodeEscapeString`.[](#l1.67)

•  :c:func:`PyUnicode_AsRawUnicodeEscapeString` or[](#l1.68)

•  :c:func:`PyUnicode_AsEncodedString`.[](#l1.69)

Latin-1 Codecs @@ -1367,7 +1368,8 @@ ordinals and only these are accepted by .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:Py_UNICODE API; please migrate to using

•  :c:func:`PyUnicode_AsLatin1String`.[](#l1.77)

•  :c:func:`PyUnicode_AsLatin1String` or[](#l1.78)

•  :c:func:`PyUnicode_AsEncodedString`.[](#l1.79)

ASCII Codecs @@ -1398,7 +1400,8 @@ codes generate errors. .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:Py_UNICODE API; please migrate to using

•  :c:func:`PyUnicode_AsASCIIString`.[](#l1.87)

•  :c:func:`PyUnicode_AsASCIIString` or[](#l1.88)

•  :c:func:`PyUnicode_AsEncodedString`.[](#l1.89)

Character Map Codecs @@ -1462,9 +1465,9 @@ The following codec API is special in th :exc:LookupError) are left untouched and are copied as-is. .. deprecated-removed:: 3.3 4.0

•  Part of the old-style :c:type:`Py_UNICODE` API.[](#l1.97)

-

• .. XXX replace with what?

•  Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using[](#l1.100)

•  :c:func:`PyUnicode_Translate`. or :ref:`generic codec based API[](#l1.101)

•  <codec-registry>`[](#l1.102)

.. c:function:: PyObject* PyUnicode_EncodeCharmap(const Py_UNICODE *s, Py_ssize_t size, [](#l1.105) @@ -1476,7 +1479,8 @@ The following codec API is special in th .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:Py_UNICODE API; please migrate to using

•  :c:func:`PyUnicode_AsCharmapString`.[](#l1.110)

•  :c:func:`PyUnicode_AsCharmapString` or[](#l1.111)

•  :c:func:`PyUnicode_AsEncodedString`.[](#l1.112)

MBCS codecs for Windows @@ -1526,7 +1530,8 @@ the user settings on the machine running .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:Py_UNICODE API; please migrate to using

•  :c:func:`PyUnicode_AsMBCSString` or :c:func:`PyUnicode_EncodeCodePage`.[](#l1.120)

•  :c:func:`PyUnicode_AsMBCSString`, :c:func:`PyUnicode_EncodeCodePage` or[](#l1.121)

•  :c:func:`PyUnicode_AsEncodedString`.[](#l1.122)

Methods & Slots