| Index: Include/unicodeobject.h |
| =================================================================== |
| --- Include/unicodeobject.h (révision 82199) |
| +++ Include/unicodeobject.h (copie de travail) |
| @@ -143,11 +143,7 @@ |
| # define PyUnicode_AsASCIIString PyUnicodeUCS2_AsASCIIString |
| # define PyUnicode_AsCharmapString PyUnicodeUCS2_AsCharmapString |
| -# define PyUnicode_AsDecodedObject PyUnicodeUCS2_AsDecodedObject |
| -# define PyUnicode_AsDecodedUnicode PyUnicodeUCS2_AsDecodedUnicode |
| -# define PyUnicode_AsEncodedObject PyUnicodeUCS2_AsEncodedObject |
| # define PyUnicode_AsEncodedString PyUnicodeUCS2_AsEncodedString |
| -# define PyUnicode_AsEncodedUnicode PyUnicodeUCS2_AsEncodedUnicode |
| # define PyUnicode_AsLatin1String PyUnicodeUCS2_AsLatin1String |
| # define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS2_AsRawUnicodeEscapeString |
| # define PyUnicode_AsUTF32String PyUnicodeUCS2_AsUTF32String |
| @@ -178,7 +174,6 @@ |
| # define PyUnicode_DecodeUTF8 PyUnicodeUCS2_DecodeUTF8 |
| # define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS2_DecodeUTF8Stateful |
| # define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS2_DecodeUnicodeEscape |
| -# define PyUnicode_Encode PyUnicodeUCS2_Encode |
| # define PyUnicode_EncodeASCII PyUnicodeUCS2_EncodeASCII |
| # define PyUnicode_EncodeCharmap PyUnicodeUCS2_EncodeCharmap |
| # define PyUnicode_EncodeDecimal PyUnicodeUCS2_EncodeDecimal |
| @@ -243,11 +238,7 @@ |
| # define PyUnicode_AsASCIIString PyUnicodeUCS4_AsASCIIString |
| # define PyUnicode_AsCharmapString PyUnicodeUCS4_AsCharmapString |
| -# define PyUnicode_AsDecodedObject PyUnicodeUCS4_AsDecodedObject |
| -# define PyUnicode_AsDecodedUnicode PyUnicodeUCS4_AsDecodedUnicode |
| -# define PyUnicode_AsEncodedObject PyUnicodeUCS4_AsEncodedObject |
| # define PyUnicode_AsEncodedString PyUnicodeUCS4_AsEncodedString |
| -# define PyUnicode_AsEncodedUnicode PyUnicodeUCS4_AsEncodedUnicode |
| # define PyUnicode_AsLatin1String PyUnicodeUCS4_AsLatin1String |
| # define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS4_AsRawUnicodeEscapeString |
| # define PyUnicode_AsUTF32String PyUnicodeUCS4_AsUTF32String |
| @@ -278,7 +269,6 @@ |
| # define PyUnicode_DecodeUTF8 PyUnicodeUCS4_DecodeUTF8 |
| # define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS4_DecodeUTF8Stateful |
| # define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS4_DecodeUnicodeEscape |
| -# define PyUnicode_Encode PyUnicodeUCS4_Encode |
| # define PyUnicode_EncodeASCII PyUnicodeUCS4_EncodeASCII |
| # define PyUnicode_EncodeCharmap PyUnicodeUCS4_EncodeCharmap |
| # define PyUnicode_EncodeDecimal PyUnicodeUCS4_EncodeDecimal |
| @@ -764,43 +754,6 @@ |
| const char *errors /* error handling */ |
| ); |
| -/* Decode a Unicode object unicode and return the result as Python |
| - object. */ |
| - |
| -PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject( |
| - PyObject *unicode, /* Unicode object */ |
| - const char *encoding, /* encoding */ |
| - const char *errors /* error handling */ |
| - ); |
| - |
| -/* Decode a Unicode object unicode and return the result as Unicode |
| - object. */ |
| - |
| -PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode( |
| - PyObject *unicode, /* Unicode object */ |
| - const char *encoding, /* encoding */ |
| - const char *errors /* error handling */ |
| - ); |
| - |
| -/* Encodes a Py_UNICODE buffer of the given size and returns a |
| - Python string object. */ |
| - |
| -PyAPI_FUNC(PyObject*) PyUnicode_Encode( |
| - const Py_UNICODE *s, /* Unicode char buffer */ |
| - Py_ssize_t size, /* number of Py_UNICODE chars to encode */ |
| - const char *encoding, /* encoding */ |
| - const char *errors /* error handling */ |
| - ); |
| - |
| -/* Encodes a Unicode object and returns the result as Python |
| - object. */ |
| - |
| -PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject( |
| - PyObject *unicode, /* Unicode object */ |
| - const char *encoding, /* encoding */ |
| - const char *errors /* error handling */ |
| - ); |
| - |
| /* Encodes a Unicode object and returns the result as Python string |
| object. */ |
| @@ -810,15 +763,6 @@ |
| const char *errors /* error handling */ |
| ); |
| -/* Encodes a Unicode object and returns the result as Unicode |
| - object. */ |
| - |
| -PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode( |
| - PyObject *unicode, /* Unicode object */ |
| - const char *encoding, /* encoding */ |
| - const char *errors /* error handling */ |
| - ); |
| - |
| /* Build an encoding map. */ |
| PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap( |