summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2023-06-01 06:56:35 (GMT)
committerGitHub <noreply@github.com>2023-06-01 06:56:35 (GMT)
commit8ed705c083e8e5ff37649d998a8b1524ec921519 (patch)
tree88bdd612236308b4585d851e168c94dc1ddf5bf0 /Modules
parentf332594dd47947612e1e5d2faf287930552a5110 (diff)
downloadcpython-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 'Modules')
-rw-r--r--Modules/_io/fileio.c2
-rw-r--r--Modules/_testcapi/getargs.c8
-rw-r--r--Modules/arraymodule.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 30944fc..005c9ff 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -231,7 +231,7 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode,
/*[clinic end generated code: output=23413f68e6484bbd input=588aac967e0ba74b]*/
{
#ifdef MS_WINDOWS
- Py_UNICODE *widename = NULL;
+ wchar_t *widename = NULL;
#else
const char *name = NULL;
#endif
diff --git a/Modules/_testcapi/getargs.c b/Modules/_testcapi/getargs.c
index 95ef2d2..a473c41 100644
--- a/Modules/_testcapi/getargs.c
+++ b/Modules/_testcapi/getargs.c
@@ -594,7 +594,7 @@ getargs_y_hash(PyObject *self, PyObject *args)
static PyObject *
getargs_u(PyObject *self, PyObject *args)
{
- Py_UNICODE *str;
+ wchar_t *str;
if (!PyArg_ParseTuple(args, "u", &str)) {
return NULL;
}
@@ -604,7 +604,7 @@ getargs_u(PyObject *self, PyObject *args)
static PyObject *
getargs_u_hash(PyObject *self, PyObject *args)
{
- Py_UNICODE *str;
+ wchar_t *str;
Py_ssize_t size;
if (!PyArg_ParseTuple(args, "u#", &str, &size)) {
return NULL;
@@ -615,7 +615,7 @@ getargs_u_hash(PyObject *self, PyObject *args)
static PyObject *
getargs_Z(PyObject *self, PyObject *args)
{
- Py_UNICODE *str;
+ wchar_t *str;
if (!PyArg_ParseTuple(args, "Z", &str)) {
return NULL;
}
@@ -628,7 +628,7 @@ getargs_Z(PyObject *self, PyObject *args)
static PyObject *
getargs_Z_hash(PyObject *self, PyObject *args)
{
- Py_UNICODE *str;
+ wchar_t *str;
Py_ssize_t size;
if (!PyArg_ParseTuple(args, "Z#", &str, &size)) {
return NULL;
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index f94bbec..999b848 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1830,10 +1830,10 @@ typecode_to_mformat_code(char typecode)
return UNSIGNED_INT8;
case 'u':
- if (sizeof(Py_UNICODE) == 2) {
+ if (sizeof(wchar_t) == 2) {
return UTF16_LE + is_big_endian;
}
- if (sizeof(Py_UNICODE) == 4) {
+ if (sizeof(wchar_t) == 4) {
return UTF32_LE + is_big_endian;
}
return UNKNOWN_FORMAT;