Merge 3.3

This commit is contained in:
Martin v. Löwis 2014-01-04 11:21:15 +01:00
commit dd3c36d125
1 changed files with 62 additions and 62 deletions

View File

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