Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make PyUnicode_Copy() private => _PyUnicode_Copy()

Browse source 
Undocument the function.

Make also decode_utf8_errors() as private (static).
This commit is contained in:
Victor Stinner 2011-12-12 01:53:47 +01:00
parent 7a9105a380
commit bf6e560d0c
5 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Doc/c-api/unicode.rst
View file

@ -386,13 +386,6 @@ APIs:
.. versionadded:: 3.3
.. c:function:: PyObject* PyUnicode_Copy(PyObject *unicode)
Get a new copy of a Unicode object.
.. versionadded:: 3.3
.. c:function:: PyObject* PyUnicode_FromKindAndData(int kind, const void *buffer, \
Py_ssize_t size)

4
Doc/whatsnew/3.3.rst
View file

@ -769,8 +769,8 @@ Unicode functions and methods using :c:type:`Py_UNICODE` and
* :c:macro:`PyUnicode_GET_DATA_SIZE`: use
``PyUnicode_GET_LENGTH(str) * PyUnicode_KIND(str)`` (only work on ready
strings)
* :c:func:`PyUnicode_AsUnicodeCopy`: use :c:func:`PyUnicode_AsUCS4Copy`,
:c:func:`PyUnicode_AsWideCharString` or :c:func:`PyUnicode_Copy`
* :c:func:`PyUnicode_AsUnicodeCopy`: use :c:func:`PyUnicode_AsUCS4Copy` or
:c:func:`PyUnicode_AsWideCharString`
Functions and macros manipulating Py_UNICODE* strings:

4
Include/unicodeobject.h
View file

@ -616,9 +616,11 @@ PyAPI_FUNC(int) _PyUnicode_Ready(
#endif
/* Get a copy of a Unicode string. */
PyAPI_FUNC(PyObject*) PyUnicode_Copy(
#ifndef Py_LIMITED_API
PyAPI_FUNC(PyObject*) _PyUnicode_Copy(
PyObject *unicode
);
#endif
/* Copy character from one unicode object into another, this function performs
character conversion when necessary and falls back to memcpy if possible.

2
Objects/codeobject.c
View file

@ -249,7 +249,7 @@ validate_and_copy_tuple(PyObject *tup)
return NULL;
}
else {
item = PyUnicode_Copy(item);
item = _PyUnicode_Copy(item);
if (item == NULL) {
Py_DECREF(newtuple);
return NULL;

12
Objects/unicodeobject.c
View file

@ -497,7 +497,7 @@ unicode_result_unchanged(PyObject *unicode)
}
else
/* Subtype -- return genuine unicode string with the same value. */
return PyUnicode_Copy(unicode);
return _PyUnicode_Copy(unicode);
}
#ifdef HAVE_MBCS
@ -1961,7 +1961,7 @@ unicode_adjust_maxchar(PyObject **p_unicode)
}
PyObject*
PyUnicode_Copy(PyObject *unicode)
_PyUnicode_Copy(PyObject *unicode)
{
Py_ssize_t length;
PyObject *copy;
@ -2832,7 +2832,7 @@ PyUnicode_FromObject(register PyObject *obj)
if (PyUnicode_Check(obj)) {
/* For a Unicode subtype that's not a Unicode object,
return a true Unicode object with the same data. */
return PyUnicode_Copy(obj);
return _PyUnicode_Copy(obj);
}
PyErr_Format(PyExc_TypeError,
"Can't convert '%.100s' object to str implicitly",
@ -4333,7 +4333,7 @@ utf8_scanner(const unsigned char *p, Py_ssize_t string_size, Py_ssize_t *unicode
goto onError; \
} while (0)
PyObject *
static PyObject *
decode_utf8_errors(const char *starts,
Py_ssize_t size,
const char *errors,
@ -9231,7 +9231,7 @@ fixup(PyObject *self,
Py_UCS4 maxchar_old, maxchar_new = 0;
PyObject *v;
u = PyUnicode_Copy(self);
u = _PyUnicode_Copy(self);
if (u == NULL)
return NULL;
maxchar_old = PyUnicode_MAX_CHAR_VALUE(u);
@ -12753,7 +12753,7 @@ PyDoc_STRVAR(sizeof__doc__,
static PyObject *
unicode_getnewargs(PyObject *v)
{
PyObject *copy = PyUnicode_Copy(v);
PyObject *copy = _PyUnicode_Copy(v);
if (!copy)
return NULL;
return Py_BuildValue("(N)", copy);