Skip to content

bpo-44029: Remove Py_UNICODE APIs #25881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 15 commits into from
May 7, 2021
Merged

bpo-44029: Remove Py_UNICODE APIs #25881

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8882e46
Remove PyUnicode_TransformDecimalToASCII
methane May 4, 2021
9b6e935
Remove PyUnicode_Encode
methane May 4, 2021
a88d8ce
Remove PyUnicode_EncodeUTF8
methane May 4, 2021
10d6d61
Remove PyUnicode_EncodeUTF32
methane May 4, 2021
0415c60
Remove PyUnicode_EncodeUTF16
methane May 4, 2021
d129b00
Remove PyUnicode_EncodeUTF7
methane May 4, 2021
ea14215
Remove PyUnicode_EncodeUnicodeEscape
methane May 4, 2021
ce5da4b
Remove PyUnicode_EncodeLatin1
methane May 4, 2021
04512ea
Remove PyUnicode_EncodeCharmap
methane May 4, 2021
07fb388
Remove PyUnicode_EncodeRawUnicodeEscape
methane May 4, 2021
3913158
Remove PyUnicode_TranslateCharmap
methane May 4, 2021
4446277
Remove PyUnicode_EncodeDecimal
methane May 4, 2021
eff35d5
Remove PyUnicode_EncodeMBCS
methane May 4, 2021
3fc48b9
Remove PyUnicodeEncodeError_Create and PyUnicodeTranslateError_Create
methane May 4, 2021
28f6dc5
Add NEWS entry
methane May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove PyUnicodeEncodeError_Create and PyUnicodeTranslateError_Create
  • Loading branch information
@methane
methane committed May 4, 2021
commit 3fc48b9874d8511ed7f2185e0213ff95140c5cfa
21 changes: 0 additions & 21 deletions Doc/c-api/exceptions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,27 +675,6 @@ The following functions are used to create and modify Unicode exceptions from C.
*object*, *length*, *start*, *end* and *reason*. *encoding* and *reason* are
UTF-8 encoded strings.

.. c:function:: PyObject* PyUnicodeEncodeError_Create(const char *encoding, const Py_UNICODE *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason)

Create a :class:`UnicodeEncodeError` object with the attributes *encoding*,
*object*, *length*, *start*, *end* and *reason*. *encoding* and *reason* are
UTF-8 encoded strings.

.. deprecated:: 3.3 3.11

``Py_UNICODE`` is deprecated since Python 3.3. Please migrate to
``PyObject_CallFunction(PyExc_UnicodeEncodeError, "sOnns", ...)``.

.. c:function:: PyObject* PyUnicodeTranslateError_Create(const Py_UNICODE *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason)

Create a :class:`UnicodeTranslateError` object with the attributes *object*,
*length*, *start*, *end* and *reason*. *reason* is a UTF-8 encoded string.

.. deprecated:: 3.3 3.11

``Py_UNICODE`` is deprecated since Python 3.3. Please migrate to
``PyObject_CallFunction(PyExc_UnicodeTranslateError, "Onns", ...)``.

.. c:function:: PyObject* PyUnicodeDecodeError_GetEncoding(PyObject *exc)
PyObject* PyUnicodeEncodeError_GetEncoding(PyObject *exc)

Expand Down
15 changes: 0 additions & 15 deletions Doc/data/refcounts.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2822,21 +2822,6 @@ PyUnicodeDecodeError_SetStart:int:::
PyUnicodeDecodeError_SetStart:PyObject*:exc:0:
PyUnicodeDecodeError_SetStart:Py_ssize_t:start::

PyUnicodeEncodeError_Create:PyObject*::+1:
PyUnicodeEncodeError_Create:const char*:encoding::
PyUnicodeEncodeError_Create:const Py_UNICODE*:object::
PyUnicodeEncodeError_Create:Py_ssize_t:length::
PyUnicodeEncodeError_Create:Py_ssize_t:start::
PyUnicodeEncodeError_Create:Py_ssize_t:end::
PyUnicodeEncodeError_Create:const char*:reason::

PyUnicodeTranslateError_Create:PyObject*::+1:
PyUnicodeTranslateError_Create:const Py_UNICODE*:object::
PyUnicodeTranslateError_Create:Py_ssize_t:length::
PyUnicodeTranslateError_Create:Py_ssize_t:start::
PyUnicodeTranslateError_Create:Py_ssize_t:end::
PyUnicodeTranslateError_Create:const char*:reason::

PyWeakref_Check:int:::
PyWeakref_Check:PyObject*:ob::

Expand Down
24 changes: 0 additions & 24 deletions Include/cpython/pyerrors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,30 +161,6 @@ PyAPI_FUNC(PyObject *) PyErr_ProgramTextObject(
PyObject *filename,
int lineno);

/* Create a UnicodeEncodeError object.
*
* TODO: This API will be removed in Python 3.11.
*/
Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create(
const char *encoding, /* UTF-8 encoded string */
const Py_UNICODE *object,
Py_ssize_t length,
Py_ssize_t start,
Py_ssize_t end,
const char *reason /* UTF-8 encoded string */
);

/* Create a UnicodeTranslateError object.
*
* TODO: This API will be removed in Python 3.11.
*/
Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create(
const Py_UNICODE *object,
Py_ssize_t length,
Py_ssize_t start,
Py_ssize_t end,
const char *reason /* UTF-8 encoded string */
);
PyAPI_FUNC(PyObject *) _PyUnicodeTranslateError_Create(
PyObject *object,
Py_ssize_t start,
Expand Down
19 changes: 0 additions & 19 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2129,15 +2129,6 @@ static PyTypeObject _PyExc_UnicodeEncodeError = {
};
PyObject *PyExc_UnicodeEncodeError = (PyObject *)&_PyExc_UnicodeEncodeError;

PyObject *
PyUnicodeEncodeError_Create(
const char *encoding, const Py_UNICODE *object, Py_ssize_t length,
Py_ssize_t start, Py_ssize_t end, const char *reason)
{
return PyObject_CallFunction(PyExc_UnicodeEncodeError, "su#nns",
encoding, object, length, start, end, reason);
}


/*
* UnicodeDecodeError extends UnicodeError
Expand Down Expand Up @@ -2342,16 +2333,6 @@ static PyTypeObject _PyExc_UnicodeTranslateError = {
};
PyObject *PyExc_UnicodeTranslateError = (PyObject *)&_PyExc_UnicodeTranslateError;

/* Deprecated. */
PyObject *
PyUnicodeTranslateError_Create(
const Py_UNICODE *object, Py_ssize_t length,
Py_ssize_t start, Py_ssize_t end, const char *reason)
{
return PyObject_CallFunction(PyExc_UnicodeTranslateError, "u#nns",
object, length, start, end, reason);
}

PyObject *
_PyUnicodeTranslateError_Create(
PyObject *object,
Expand Down