Added new APIs and fixed some other Unicode ones (missing * or

extra ' ').

diff --git a/Doc/api/refcounts.dat b/Doc/api/refcounts.dat
index 2db4b4452494f8764077f7bb0ba40db46976fa80..be4651893a858db06bc2b59af935fed4def8cf92 100644 (file)
--- a/Doc/api/refcounts.dat
+++ b/Doc/api/refcounts.dat
@@ -772,6 +772,23 @@ PyString_InternInPlace:PyObject**:string:+1:???
 PyString_Size:int:::
 PyString_Size:PyObject*:string:0:
 
+PyString_Decode:PyObject*::+1:
+PyString_Decode:const char*:s::
+PyString_Decode:int:size::
+PyString_Decode:const char*:encoding::
+PyString_Decode:const char*:errors::
+
+PyString_Encode:PyObject*::+1:
+PyString_Encode:const char*:s::
+PyString_Encode:int:size::
+PyString_Encode:const char*:encoding::
+PyString_Encode:const char*:errors::
+
+PyString_AsEncodedString:PyObject*::+1:
+PyString_AsEncodedString:PyObject*:str::
+PyString_AsEncodedString:const char*:encoding::
+PyString_AsEncodedString:const char*:errors::
+
 PySys_SetArgv:int:::
 PySys_SetArgv:int:argc::
 PySys_SetArgv:char**:argv::
@@ -880,7 +897,7 @@ Py_UNICODE_TONUMERIC:double:::
 Py_UNICODE_TONUMERIC:Py_UNICODE:ch::
 
 PyUnicode_FromUnicode:PyObject*::+1:
-PyUnicode_FromUnicode:const Py_UNICODE *:u::
+PyUnicode_FromUnicode:const Py_UNICODE*:u::
 PyUnicode_FromUnicode:int:size::
 
 PyUnicode_AsUnicode:Py_UNICODE*:::
@@ -890,148 +907,153 @@ PyUnicode_GetSize:int:::
 PyUnicode_GetSize:PyObject :*unicode:0:
 
 PyUnicode_FromObject:PyObject*::+1:
-PyUnicode_FromObject:PyObject :*obj:0:
+PyUnicode_FromObject:PyObject*:*obj:0:
+
+PyUnicode_FromEncodedObject:PyObject*::+1:
+PyUnicode_FromEncodedObject:PyObject*:*obj:0:
+PyUnicode_FromEncodedObject:const char*:encoding::
+PyUnicode_FromEncodedObject:const char*:errors::
 
 PyUnicode_FromWideChar:PyObject*::+1:
-PyUnicode_FromWideChar:const wchar_t *:w::
+PyUnicode_FromWideChar:const wchar_t*:w::
 PyUnicode_FromWideChar:int:size::
 
 PyUnicode_AsWideChar:int:::
-PyUnicode_AsWideChar:PyObject :*unicode:0:
-PyUnicode_AsWideChar:wchar_t *:w::
+PyUnicode_AsWideChar:PyObject*:*unicode:0:
+PyUnicode_AsWideChar:wchar_t*:w::
 PyUnicode_AsWideChar:int:size::
 
 PyUnicode_Decode:PyObject*::+1:
-PyUnicode_Decode:const char *:s::
+PyUnicode_Decode:const char*:s::
 PyUnicode_Decode:int:size::
-PyUnicode_Decode:const char *:encoding::
-PyUnicode_Decode:const char *:errors::
+PyUnicode_Decode:const char*:encoding::
+PyUnicode_Decode:const char*:errors::
 
 PyUnicode_Encode:PyObject*::+1:
-PyUnicode_Encode:const Py_UNICODE *:s::
+PyUnicode_Encode:const Py_UNICODE*:s::
 PyUnicode_Encode:int:size::
-PyUnicode_Encode:const char *:encoding::
-PyUnicode_Encode:const char *:errors::
+PyUnicode_Encode:const char*:encoding::
+PyUnicode_Encode:const char*:errors::
 
 PyUnicode_AsEncodedString:PyObject*::+1:
-PyUnicode_AsEncodedString:PyObject *:unicode::
-PyUnicode_AsEncodedString:const char *:encoding::
-PyUnicode_AsEncodedString:const char *:errors::
+PyUnicode_AsEncodedString:PyObject*:unicode::
+PyUnicode_AsEncodedString:const char*:encoding::
+PyUnicode_AsEncodedString:const char*:errors::
 
 PyUnicode_DecodeUTF8:PyObject*::+1:
-PyUnicode_DecodeUTF8:const char *:s::
+PyUnicode_DecodeUTF8:const char*:s::
 PyUnicode_DecodeUTF8:int:size::
-PyUnicode_DecodeUTF8:const char *:errors::
+PyUnicode_DecodeUTF8:const char*:errors::
 
 PyUnicode_EncodeUTF8:PyObject*::+1:
-PyUnicode_EncodeUTF8:const Py_UNICODE *:s::
+PyUnicode_EncodeUTF8:const Py_UNICODE*:s::
 PyUnicode_EncodeUTF8:int:size::
-PyUnicode_EncodeUTF8:const char *:errors::
+PyUnicode_EncodeUTF8:const char*:errors::
 
 PyUnicode_AsUTF8String:PyObject*::+1:
-PyUnicode_AsUTF8String:PyObject *:unicode::
+PyUnicode_AsUTF8String:PyObject*:unicode::
 
 PyUnicode_DecodeUTF16:PyObject*::+1:
-PyUnicode_DecodeUTF16:const char *:s::
+PyUnicode_DecodeUTF16:const char*:s::
 PyUnicode_DecodeUTF16:int:size::
-PyUnicode_DecodeUTF16:const char *:errors::
+PyUnicode_DecodeUTF16:const char*:errors::
 PyUnicode_DecodeUTF16:int*:byteorder::
 
 PyUnicode_EncodeUTF16:PyObject*::+1:
-PyUnicode_EncodeUTF16:const Py_UNICODE *:s::
+PyUnicode_EncodeUTF16:const Py_UNICODE*:s::
 PyUnicode_EncodeUTF16:int:size::
-PyUnicode_EncodeUTF16:const char *:errors::
+PyUnicode_EncodeUTF16:const char*:errors::
 PyUnicode_EncodeUTF16:int:byteorder::
 
 PyUnicode_AsUTF16String:PyObject*::+1:
-PyUnicode_AsUTF16String:PyObject *:unicode::
+PyUnicode_AsUTF16String:PyObject*:unicode::
 
 PyUnicode_DecodeUnicodeEscape:PyObject*::+1:
-PyUnicode_DecodeUnicodeEscape:const char *:s::
+PyUnicode_DecodeUnicodeEscape:const char*:s::
 PyUnicode_DecodeUnicodeEscape:int:size::
-PyUnicode_DecodeUnicodeEscape:const char *:errors::
+PyUnicode_DecodeUnicodeEscape:const char*:errors::
 
 PyUnicode_EncodeUnicodeEscape:PyObject*::+1:
-PyUnicode_EncodeUnicodeEscape:const Py_UNICODE *:s::
+PyUnicode_EncodeUnicodeEscape:const Py_UNICODE*:s::
 PyUnicode_EncodeUnicodeEscape:int:size::
-PyUnicode_EncodeUnicodeEscape:const char *:errors::
+PyUnicode_EncodeUnicodeEscape:const char*:errors::
 
 PyUnicode_AsUnicodeEscapeString:PyObject*::+1:
-PyUnicode_AsUnicodeEscapeString:PyObject *:unicode::
+PyUnicode_AsUnicodeEscapeString:PyObject*:unicode::
 
 PyUnicode_DecodeRawUnicodeEscape:PyObject*::+1:
-PyUnicode_DecodeRawUnicodeEscape:const char *:s::
+PyUnicode_DecodeRawUnicodeEscape:const char*:s::
 PyUnicode_DecodeRawUnicodeEscape:int:size::
-PyUnicode_DecodeRawUnicodeEscape:const char *:errors::
+PyUnicode_DecodeRawUnicodeEscape:const char*:errors::
 
 PyUnicode_EncodeRawUnicodeEscape:PyObject*::+1:
-PyUnicode_EncodeRawUnicodeEscape:const Py_UNICODE *:s::
+PyUnicode_EncodeRawUnicodeEscape:const Py_UNICODE*:s::
 PyUnicode_EncodeRawUnicodeEscape:int:size::
-PyUnicode_EncodeRawUnicodeEscape:const char *:errors::
+PyUnicode_EncodeRawUnicodeEscape:const char*:errors::
 
 PyUnicode_AsRawUnicodeEscapeString:PyObject*::+1:
-PyUnicode_AsRawUnicodeEscapeString:PyObject *:unicode::
+PyUnicode_AsRawUnicodeEscapeString:PyObject*:unicode::
 
 PyUnicode_DecodeLatin1:PyObject*::+1:
-PyUnicode_DecodeLatin1:const char *:s::
+PyUnicode_DecodeLatin1:const char*:s::
 PyUnicode_DecodeLatin1:int:size::
-PyUnicode_DecodeLatin1:const char *:errors::
+PyUnicode_DecodeLatin1:const char*:errors::
 
 PyUnicode_EncodeLatin1:PyObject*::+1:
-PyUnicode_EncodeLatin1:const Py_UNICODE *:s::
+PyUnicode_EncodeLatin1:const Py_UNICODE*:s::
 PyUnicode_EncodeLatin1:int:size::
-PyUnicode_EncodeLatin1:const char *:errors::
+PyUnicode_EncodeLatin1:const char*:errors::
 
 PyUnicode_AsLatin1String:PyObject*::+1:
-PyUnicode_AsLatin1String:PyObject *:unicode::
+PyUnicode_AsLatin1String:PyObject*:unicode::
 
 PyUnicode_DecodeASCII:PyObject*::+1:
-PyUnicode_DecodeASCII:const char *:s::
+PyUnicode_DecodeASCII:const char*:s::
 PyUnicode_DecodeASCII:int:size::
-PyUnicode_DecodeASCII:const char *:errors::
+PyUnicode_DecodeASCII:const char*:errors::
 
 PyUnicode_EncodeASCII:PyObject*::+1:
-PyUnicode_EncodeASCII:const Py_UNICODE *:s::
+PyUnicode_EncodeASCII:const Py_UNICODE*:s::
 PyUnicode_EncodeASCII:int:size::
-PyUnicode_EncodeASCII:const char *:errors::
+PyUnicode_EncodeASCII:const char*:errors::
 
 PyUnicode_AsASCIIString:PyObject*::+1:
-PyUnicode_AsASCIIString:PyObject *:unicode::
+PyUnicode_AsASCIIString:PyObject*:unicode::
 
 PyUnicode_DecodeCharmap:PyObject*::+1:
-PyUnicode_DecodeCharmap:const char *:s::
+PyUnicode_DecodeCharmap:const char*:s::
 PyUnicode_DecodeCharmap:int:size::
 PyUnicode_DecodeCharmap:PyObject*:mapping:0:
-PyUnicode_DecodeCharmap:const char *:errors::
+PyUnicode_DecodeCharmap:const char*:errors::
 
 PyUnicode_EncodeCharmap:PyObject*::+1:
-PyUnicode_EncodeCharmap:const Py_UNICODE *:s::
+PyUnicode_EncodeCharmap:const Py_UNICODE*:s::
 PyUnicode_EncodeCharmap:int:size::
 PyUnicode_EncodeCharmap:PyObject*:mapping:0:
-PyUnicode_EncodeCharmap:const char *:errors::
+PyUnicode_EncodeCharmap:const char*:errors::
 
 PyUnicode_AsCharmapString:PyObject*::+1:
 PyUnicode_AsCharmapString:PyObject*:unicode:0:
 PyUnicode_AsCharmapString:PyObject*:mapping:0:
 
 PyUnicode_TranslateCharmap:PyObject*::+1:
-PyUnicode_TranslateCharmap:const Py_UNICODE *:s::
+PyUnicode_TranslateCharmap:const Py_UNICODE*:s::
 PyUnicode_TranslateCharmap:int:size::
 PyUnicode_TranslateCharmap:PyObject*:table:0:
-PyUnicode_TranslateCharmap:const char *:errors::
+PyUnicode_TranslateCharmap:const char*:errors::
 
 PyUnicode_DecodeMBCS:PyObject*::+1:
-PyUnicode_DecodeMBCS:const char *:s::
+PyUnicode_DecodeMBCS:const char*:s::
 PyUnicode_DecodeMBCS:int:size::
-PyUnicode_DecodeMBCS:const char *:errors::
+PyUnicode_DecodeMBCS:const char*:errors::
 
 PyUnicode_EncodeMBCS:PyObject*::+1:
-PyUnicode_EncodeMBCS:const Py_UNICODE *:s::
+PyUnicode_EncodeMBCS:const Py_UNICODE*:s::
 PyUnicode_EncodeMBCS:int:size::
-PyUnicode_EncodeMBCS:const char *:errors::
+PyUnicode_EncodeMBCS:const char*:errors::
 
 PyUnicode_AsMBCSString:PyObject*::+1:
-PyUnicode_AsMBCSString:PyObject *:unicode::
+PyUnicode_AsMBCSString:PyObject*:unicode::
 
 PyUnicode_Concat:PyObject*::+1:
 PyUnicode_Concat:PyObject*:left:0:
@@ -1049,7 +1071,7 @@ PyUnicode_Splitlines:int:maxsplit::
 PyUnicode_Translate:PyObject*::+1:
 PyUnicode_Translate:PyObject*:str:0:
 PyUnicode_Translate:PyObject*:table:0:
-PyUnicode_Translate:const char *:errors::
+PyUnicode_Translate:const char*:errors::
 
 PyUnicode_Join:PyObject*::+1:
 PyUnicode_Join:PyObject*:separator:0: