mirror of
https://github.com/python/cpython.git
synced 2025-10-08 08:01:55 +00:00
gh-111089: Revert PyUnicode_AsUTF8() changes (#111833)
* Revert "gh-111089: Use PyUnicode_AsUTF8() in Argument Clinic (#111585)" This reverts commitd9b606b3d0
. * Revert "gh-111089: Use PyUnicode_AsUTF8() in getargs.c (#111620)" This reverts commitcde1071b2a
. * Revert "gh-111089: PyUnicode_AsUTF8() now raises on embedded NUL (#111091)" This reverts commitd731579bfb
. * Revert "gh-111089: Add PyUnicode_AsUTF8() to the limited C API (#111121)" This reverts commitd8f32be5b6
. * Revert "gh-111089: Use PyUnicode_AsUTF8() in sqlite3 (#111122)" This reverts commit37e4e20eaa
.
This commit is contained in:
parent
ea970fb116
commit
11e83488c5
50 changed files with 951 additions and 243 deletions
|
@ -3844,13 +3844,7 @@ PyUnicode_AsUTF8AndSize(PyObject *unicode, Py_ssize_t *psize)
|
|||
const char *
|
||||
PyUnicode_AsUTF8(PyObject *unicode)
|
||||
{
|
||||
Py_ssize_t size;
|
||||
const char *utf8 = PyUnicode_AsUTF8AndSize(unicode, &size);
|
||||
if (utf8 != NULL && strlen(utf8) != (size_t)size) {
|
||||
PyErr_SetString(PyExc_ValueError, "embedded null character");
|
||||
return NULL;
|
||||
}
|
||||
return utf8;
|
||||
return PyUnicode_AsUTF8AndSize(unicode, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue