Merge with 3.3: Issue #17432: Drop UCS2 from names of Unicode functions in python3.def.

This commit is contained in:
Martin v. Löwis 2014-01-04 10:06:28 +01:00
commit 6087646ec0
2 changed files with 64 additions and 62 deletions

View File

@ -10,6 +10,8 @@ Release date: 2014-01-05
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #17432: Drop UCS2 from names of Unicode functions in python3.def.
- Issue #19526: Exclude all new API from the stable ABI. Exceptions can be - Issue #19526: Exclude all new API from the stable ABI. Exceptions can be
made if a need is demonstrated. made if a need is demonstrated.

View File

@ -548,68 +548,68 @@ EXPORTS
PyUnicodeTranslateError_SetEnd=python34.PyUnicodeTranslateError_SetEnd PyUnicodeTranslateError_SetEnd=python34.PyUnicodeTranslateError_SetEnd
PyUnicodeTranslateError_SetReason=python34.PyUnicodeTranslateError_SetReason PyUnicodeTranslateError_SetReason=python34.PyUnicodeTranslateError_SetReason
PyUnicodeTranslateError_SetStart=python34.PyUnicodeTranslateError_SetStart PyUnicodeTranslateError_SetStart=python34.PyUnicodeTranslateError_SetStart
PyUnicode_Append=python34.PyUnicodeUCS2_Append PyUnicode_Append=python34.PyUnicode_Append
PyUnicode_AppendAndDel=python34.PyUnicodeUCS2_AppendAndDel PyUnicode_AppendAndDel=python34.PyUnicode_AppendAndDel
PyUnicode_AsASCIIString=python34.PyUnicodeUCS2_AsASCIIString PyUnicode_AsASCIIString=python34.PyUnicode_AsASCIIString
PyUnicode_AsCharmapString=python34.PyUnicodeUCS2_AsCharmapString PyUnicode_AsCharmapString=python34.PyUnicode_AsCharmapString
PyUnicode_AsDecodedObject=python34.PyUnicodeUCS2_AsDecodedObject PyUnicode_AsDecodedObject=python34.PyUnicode_AsDecodedObject
PyUnicode_AsDecodedUnicode=python34.PyUnicodeUCS2_AsDecodedUnicode PyUnicode_AsDecodedUnicode=python34.PyUnicode_AsDecodedUnicode
PyUnicode_AsEncodedObject=python34.PyUnicodeUCS2_AsEncodedObject PyUnicode_AsEncodedObject=python34.PyUnicode_AsEncodedObject
PyUnicode_AsEncodedString=python34.PyUnicodeUCS2_AsEncodedString PyUnicode_AsEncodedString=python34.PyUnicode_AsEncodedString
PyUnicode_AsEncodedUnicode=python34.PyUnicodeUCS2_AsEncodedUnicode PyUnicode_AsEncodedUnicode=python34.PyUnicode_AsEncodedUnicode
PyUnicode_AsLatin1String=python34.PyUnicodeUCS2_AsLatin1String PyUnicode_AsLatin1String=python34.PyUnicode_AsLatin1String
PyUnicode_AsRawUnicodeEscapeString=python34.PyUnicodeUCS2_AsRawUnicodeEscapeString PyUnicode_AsRawUnicodeEscapeString=python34.PyUnicode_AsRawUnicodeEscapeString
PyUnicode_AsUTF16String=python34.PyUnicodeUCS2_AsUTF16String PyUnicode_AsUTF16String=python34.PyUnicode_AsUTF16String
PyUnicode_AsUTF32String=python34.PyUnicodeUCS2_AsUTF32String PyUnicode_AsUTF32String=python34.PyUnicode_AsUTF32String
PyUnicode_AsUTF8String=python34.PyUnicodeUCS2_AsUTF8String PyUnicode_AsUTF8String=python34.PyUnicode_AsUTF8String
PyUnicode_AsUnicodeEscapeString=python34.PyUnicodeUCS2_AsUnicodeEscapeString PyUnicode_AsUnicodeEscapeString=python34.PyUnicode_AsUnicodeEscapeString
PyUnicode_AsWideChar=python34.PyUnicodeUCS2_AsWideChar PyUnicode_AsWideChar=python34.PyUnicode_AsWideChar
PyUnicode_ClearFreelist=python34.PyUnicodeUCS2_ClearFreelist PyUnicode_ClearFreelist=python34.PyUnicode_ClearFreelist
PyUnicode_Compare=python34.PyUnicodeUCS2_Compare PyUnicode_Compare=python34.PyUnicode_Compare
PyUnicode_Concat=python34.PyUnicodeUCS2_Concat PyUnicode_Concat=python34.PyUnicode_Concat
PyUnicode_Contains=python34.PyUnicodeUCS2_Contains PyUnicode_Contains=python34.PyUnicode_Contains
PyUnicode_Count=python34.PyUnicodeUCS2_Count PyUnicode_Count=python34.PyUnicode_Count
PyUnicode_Decode=python34.PyUnicodeUCS2_Decode PyUnicode_Decode=python34.PyUnicode_Decode
PyUnicode_DecodeASCII=python34.PyUnicodeUCS2_DecodeASCII PyUnicode_DecodeASCII=python34.PyUnicode_DecodeASCII
PyUnicode_DecodeCharmap=python34.PyUnicodeUCS2_DecodeCharmap PyUnicode_DecodeCharmap=python34.PyUnicode_DecodeCharmap
PyUnicode_DecodeFSDefault=python34.PyUnicodeUCS2_DecodeFSDefault PyUnicode_DecodeFSDefault=python34.PyUnicode_DecodeFSDefault
PyUnicode_DecodeFSDefaultAndSize=python34.PyUnicodeUCS2_DecodeFSDefaultAndSize PyUnicode_DecodeFSDefaultAndSize=python34.PyUnicode_DecodeFSDefaultAndSize
PyUnicode_DecodeLatin1=python34.PyUnicodeUCS2_DecodeLatin1 PyUnicode_DecodeLatin1=python34.PyUnicode_DecodeLatin1
PyUnicode_DecodeRawUnicodeEscape=python34.PyUnicodeUCS2_DecodeRawUnicodeEscape PyUnicode_DecodeRawUnicodeEscape=python34.PyUnicode_DecodeRawUnicodeEscape
PyUnicode_DecodeUTF16=python34.PyUnicodeUCS2_DecodeUTF16 PyUnicode_DecodeUTF16=python34.PyUnicode_DecodeUTF16
PyUnicode_DecodeUTF16Stateful=python34.PyUnicodeUCS2_DecodeUTF16Stateful PyUnicode_DecodeUTF16Stateful=python34.PyUnicode_DecodeUTF16Stateful
PyUnicode_DecodeUTF32=python34.PyUnicodeUCS2_DecodeUTF32 PyUnicode_DecodeUTF32=python34.PyUnicode_DecodeUTF32
PyUnicode_DecodeUTF32Stateful=python34.PyUnicodeUCS2_DecodeUTF32Stateful PyUnicode_DecodeUTF32Stateful=python34.PyUnicode_DecodeUTF32Stateful
PyUnicode_DecodeUTF8=python34.PyUnicodeUCS2_DecodeUTF8 PyUnicode_DecodeUTF8=python34.PyUnicode_DecodeUTF8
PyUnicode_DecodeUTF8Stateful=python34.PyUnicodeUCS2_DecodeUTF8Stateful PyUnicode_DecodeUTF8Stateful=python34.PyUnicode_DecodeUTF8Stateful
PyUnicode_DecodeUnicodeEscape=python34.PyUnicodeUCS2_DecodeUnicodeEscape PyUnicode_DecodeUnicodeEscape=python34.PyUnicode_DecodeUnicodeEscape
PyUnicode_FSConverter=python34.PyUnicodeUCS2_FSConverter PyUnicode_FSConverter=python34.PyUnicode_FSConverter
PyUnicode_FSDecoder=python34.PyUnicodeUCS2_FSDecoder PyUnicode_FSDecoder=python34.PyUnicode_FSDecoder
PyUnicode_Find=python34.PyUnicodeUCS2_Find PyUnicode_Find=python34.PyUnicode_Find
PyUnicode_Format=python34.PyUnicodeUCS2_Format PyUnicode_Format=python34.PyUnicode_Format
PyUnicode_FromEncodedObject=python34.PyUnicodeUCS2_FromEncodedObject PyUnicode_FromEncodedObject=python34.PyUnicode_FromEncodedObject
PyUnicode_FromFormat=python34.PyUnicodeUCS2_FromFormat PyUnicode_FromFormat=python34.PyUnicode_FromFormat
PyUnicode_FromFormatV=python34.PyUnicodeUCS2_FromFormatV PyUnicode_FromFormatV=python34.PyUnicode_FromFormatV
PyUnicode_FromObject=python34.PyUnicodeUCS2_FromObject PyUnicode_FromObject=python34.PyUnicode_FromObject
PyUnicode_FromOrdinal=python34.PyUnicodeUCS2_FromOrdinal PyUnicode_FromOrdinal=python34.PyUnicode_FromOrdinal
PyUnicode_FromString=python34.PyUnicodeUCS2_FromString PyUnicode_FromString=python34.PyUnicode_FromString
PyUnicode_FromStringAndSize=python34.PyUnicodeUCS2_FromStringAndSize PyUnicode_FromStringAndSize=python34.PyUnicode_FromStringAndSize
PyUnicode_FromWideChar=python34.PyUnicodeUCS2_FromWideChar PyUnicode_FromWideChar=python34.PyUnicode_FromWideChar
PyUnicode_GetDefaultEncoding=python34.PyUnicodeUCS2_GetDefaultEncoding PyUnicode_GetDefaultEncoding=python34.PyUnicode_GetDefaultEncoding
PyUnicode_GetSize=python34.PyUnicodeUCS2_GetSize PyUnicode_GetSize=python34.PyUnicode_GetSize
PyUnicode_IsIdentifier=python34.PyUnicodeUCS2_IsIdentifier PyUnicode_IsIdentifier=python34.PyUnicode_IsIdentifier
PyUnicode_Join=python34.PyUnicodeUCS2_Join PyUnicode_Join=python34.PyUnicode_Join
PyUnicode_Partition=python34.PyUnicodeUCS2_Partition PyUnicode_Partition=python34.PyUnicode_Partition
PyUnicode_RPartition=python34.PyUnicodeUCS2_RPartition PyUnicode_RPartition=python34.PyUnicode_RPartition
PyUnicode_RSplit=python34.PyUnicodeUCS2_RSplit PyUnicode_RSplit=python34.PyUnicode_RSplit
PyUnicode_Replace=python34.PyUnicodeUCS2_Replace PyUnicode_Replace=python34.PyUnicode_Replace
PyUnicode_Resize=python34.PyUnicodeUCS2_Resize PyUnicode_Resize=python34.PyUnicode_Resize
PyUnicode_RichCompare=python34.PyUnicodeUCS2_RichCompare PyUnicode_RichCompare=python34.PyUnicode_RichCompare
PyUnicode_SetDefaultEncoding=python34.PyUnicodeUCS2_SetDefaultEncoding PyUnicode_SetDefaultEncoding=python34.PyUnicode_SetDefaultEncoding
PyUnicode_Split=python34.PyUnicodeUCS2_Split PyUnicode_Split=python34.PyUnicode_Split
PyUnicode_Splitlines=python34.PyUnicodeUCS2_Splitlines PyUnicode_Splitlines=python34.PyUnicode_Splitlines
PyUnicode_Tailmatch=python34.PyUnicodeUCS2_Tailmatch PyUnicode_Tailmatch=python34.PyUnicode_Tailmatch
PyUnicode_Translate=python34.PyUnicodeUCS2_Translate PyUnicode_Translate=python34.PyUnicode_Translate
PyUnicode_BuildEncodingMap=python34.PyUnicode_BuildEncodingMap PyUnicode_BuildEncodingMap=python34.PyUnicode_BuildEncodingMap
PyUnicode_CompareWithASCIIString=python34.PyUnicode_CompareWithASCIIString PyUnicode_CompareWithASCIIString=python34.PyUnicode_CompareWithASCIIString
PyUnicode_DecodeUTF7=python34.PyUnicode_DecodeUTF7 PyUnicode_DecodeUTF7=python34.PyUnicode_DecodeUTF7