diff options
| author | Victor Stinner <vstinner@python.org> | 2023-06-01 06:56:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 06:56:35 (GMT) |
| commit | 8ed705c083e8e5ff37649d998a8b1524ec921519 (patch) | |
| tree | 88bdd612236308b4585d851e168c94dc1ddf5bf0 /Objects/unicodeobject.c | |
| parent | f332594dd47947612e1e5d2faf287930552a5110 (diff) | |
| download | cpython-8ed705c083e8e5ff37649d998a8b1524ec921519.zip cpython-8ed705c083e8e5ff37649d998a8b1524ec921519.tar.gz cpython-8ed705c083e8e5ff37649d998a8b1524ec921519.tar.bz2 | |
gh-105156: Deprecate the old Py_UNICODE type in C API (#105157)
Deprecate the old Py_UNICODE and PY_UNICODE_TYPE types in the C API:
use wchar_t instead.
Replace Py_UNICODE with wchar_t in multiple C files.
Co-authored-by: Inada Naoki <songofacandy@gmail.com>
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 6f25f91..ffb4a87 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1800,14 +1800,14 @@ PyUnicode_FromWideChar(const wchar_t *u, Py_ssize_t size) switch (PyUnicode_KIND(unicode)) { case PyUnicode_1BYTE_KIND: - _PyUnicode_CONVERT_BYTES(Py_UNICODE, unsigned char, + _PyUnicode_CONVERT_BYTES(wchar_t, unsigned char, u, u + size, PyUnicode_1BYTE_DATA(unicode)); break; case PyUnicode_2BYTE_KIND: #if Py_UNICODE_SIZE == 2 memcpy(PyUnicode_2BYTE_DATA(unicode), u, size * 2); #else - _PyUnicode_CONVERT_BYTES(Py_UNICODE, Py_UCS2, + _PyUnicode_CONVERT_BYTES(wchar_t, Py_UCS2, u, u + size, PyUnicode_2BYTE_DATA(unicode)); #endif break; @@ -3809,9 +3809,9 @@ PyUnicode_AsUTF8(PyObject *unicode) PyUnicode_GetSize() has been deprecated since Python 3.3 because it returned length of Py_UNICODE. -But this function is part of stable abi, because it don't +But this function is part of stable abi, because it doesn't include Py_UNICODE in signature and it was not excluded from -stable abi in PEP 384. +stable ABI in PEP 384. */ PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(PyObject *unicode) |