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