diff options
author | Marc-André Lemburg <mal@egenix.com> | 2008-08-07 18:54:33 (GMT) |
---|---|---|
committer | Marc-André Lemburg <mal@egenix.com> | 2008-08-07 18:54:33 (GMT) |
commit | 4cc0f24857c345ba99691b2ae6829c6ce3c0edcd (patch) | |
tree | cb4d437c9acb08f213376a499542f2e3bf81b8ad /Include | |
parent | 28bd1a3bd5cf7f8c161bddb1735c4968fb9f6a8f (diff) | |
download | cpython-4cc0f24857c345ba99691b2ae6829c6ce3c0edcd.zip cpython-4cc0f24857c345ba99691b2ae6829c6ce3c0edcd.tar.gz cpython-4cc0f24857c345ba99691b2ae6829c6ce3c0edcd.tar.bz2 |
Rename PyUnicode_AsString -> _PyUnicode_AsString and
PyUnicode_AsStringAndSize -> _PyUnicode_AsStringAndSize to mark
them for interpreter internal use only.
We'll have to rework these APIs or create new ones for the
purpose of accessing the UTF-8 representation of Unicode objects
for 3.1.
Diffstat (limited to 'Include')
-rw-r--r-- | Include/object.h | 2 | ||||
-rw-r--r-- | Include/unicodeobject.h | 19 |
2 files changed, 16 insertions, 5 deletions
diff --git a/Include/object.h b/Include/object.h index 07a4b2c..f5ec7d4 100644 --- a/Include/object.h +++ b/Include/object.h @@ -466,7 +466,7 @@ PyAPI_FUNC(long) _Py_HashDouble(double); PyAPI_FUNC(long) _Py_HashPointer(void*); /* Helper for passing objects to printf and the like */ -#define PyObject_REPR(obj) PyUnicode_AsString(PyObject_Repr(obj)) +#define PyObject_REPR(obj) _PyUnicode_AsString(PyObject_Repr(obj)) /* Flag bits for printing: */ #define Py_PRINT_RAW 1 /* No string quotes etc. */ diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index d5b6572..c2360d3 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -704,9 +704,15 @@ PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize( In case of an error, no *size is set. + *** This API is for interpreter INTERNAL USE ONLY and will likely + *** be removed or changed for Python 3.1. + + *** If you need to access the Unicode object as UTF-8 bytes string, + *** please use PyUnicode_AsUTF8String() instead. + */ -PyAPI_FUNC(char *) PyUnicode_AsStringAndSize( +PyAPI_FUNC(char *) _PyUnicode_AsStringAndSize( PyObject *unicode, Py_ssize_t *size); @@ -714,12 +720,17 @@ PyAPI_FUNC(char *) PyUnicode_AsStringAndSize( Unicode object unicode. Use of this API is DEPRECATED since no size information can be - extracted from the returned data. Use PyUnicode_AsStringAndSize() - instead. + extracted from the returned data. + + *** This API is for interpreter INTERNAL USE ONLY and will likely + *** be removed or changed for Python 3.1. + + *** If you need to access the Unicode object as UTF-8 bytes string, + *** please use PyUnicode_AsUTF8String() instead. */ -PyAPI_FUNC(char *) PyUnicode_AsString(PyObject *unicode); +PyAPI_FUNC(char *) _PyUnicode_AsString(PyObject *unicode); /* Returns the currently active default encoding. |