Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6087646

Browse files
committed
Merge with 3.3: Issue #17432: Drop UCS2 from names of Unicode functions in python3.def.
2 parents e608255 + 7476289 commit 6087646

2 files changed

Lines changed: 64 additions & 62 deletions

File tree

Misc/NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Release date: 2014-01-05
1010
Core and Builtins
1111
-----------------
1212

13+
- Issue #17432: Drop UCS2 from names of Unicode functions in python3.def.
14+
1315
- Issue #19526: Exclude all new API from the stable ABI. Exceptions can be
1416
made if a need is demonstrated.
1517

PC/python3.def

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -548,68 +548,68 @@ EXPORTS
548548
PyUnicodeTranslateError_SetEnd=python34.PyUnicodeTranslateError_SetEnd
549549
PyUnicodeTranslateError_SetReason=python34.PyUnicodeTranslateError_SetReason
550550
PyUnicodeTranslateError_SetStart=python34.PyUnicodeTranslateError_SetStart
551-
PyUnicode_Append=python34.PyUnicodeUCS2_Append
552-
PyUnicode_AppendAndDel=python34.PyUnicodeUCS2_AppendAndDel
553-
PyUnicode_AsASCIIString=python34.PyUnicodeUCS2_AsASCIIString
554-
PyUnicode_AsCharmapString=python34.PyUnicodeUCS2_AsCharmapString
555-
PyUnicode_AsDecodedObject=python34.PyUnicodeUCS2_AsDecodedObject
556-
PyUnicode_AsDecodedUnicode=python34.PyUnicodeUCS2_AsDecodedUnicode
557-
PyUnicode_AsEncodedObject=python34.PyUnicodeUCS2_AsEncodedObject
558-
PyUnicode_AsEncodedString=python34.PyUnicodeUCS2_AsEncodedString
559-
PyUnicode_AsEncodedUnicode=python34.PyUnicodeUCS2_AsEncodedUnicode
560-
PyUnicode_AsLatin1String=python34.PyUnicodeUCS2_AsLatin1String
561-
PyUnicode_AsRawUnicodeEscapeString=python34.PyUnicodeUCS2_AsRawUnicodeEscapeString
562-
PyUnicode_AsUTF16String=python34.PyUnicodeUCS2_AsUTF16String
563-
PyUnicode_AsUTF32String=python34.PyUnicodeUCS2_AsUTF32String
564-
PyUnicode_AsUTF8String=python34.PyUnicodeUCS2_AsUTF8String
565-
PyUnicode_AsUnicodeEscapeString=python34.PyUnicodeUCS2_AsUnicodeEscapeString
566-
PyUnicode_AsWideChar=python34.PyUnicodeUCS2_AsWideChar
567-
PyUnicode_ClearFreelist=python34.PyUnicodeUCS2_ClearFreelist
568-
PyUnicode_Compare=python34.PyUnicodeUCS2_Compare
569-
PyUnicode_Concat=python34.PyUnicodeUCS2_Concat
570-
PyUnicode_Contains=python34.PyUnicodeUCS2_Contains
571-
PyUnicode_Count=python34.PyUnicodeUCS2_Count
572-
PyUnicode_Decode=python34.PyUnicodeUCS2_Decode
573-
PyUnicode_DecodeASCII=python34.PyUnicodeUCS2_DecodeASCII
574-
PyUnicode_DecodeCharmap=python34.PyUnicodeUCS2_DecodeCharmap
575-
PyUnicode_DecodeFSDefault=python34.PyUnicodeUCS2_DecodeFSDefault
576-
PyUnicode_DecodeFSDefaultAndSize=python34.PyUnicodeUCS2_DecodeFSDefaultAndSize
577-
PyUnicode_DecodeLatin1=python34.PyUnicodeUCS2_DecodeLatin1
578-
PyUnicode_DecodeRawUnicodeEscape=python34.PyUnicodeUCS2_DecodeRawUnicodeEscape
579-
PyUnicode_DecodeUTF16=python34.PyUnicodeUCS2_DecodeUTF16
580-
PyUnicode_DecodeUTF16Stateful=python34.PyUnicodeUCS2_DecodeUTF16Stateful
581-
PyUnicode_DecodeUTF32=python34.PyUnicodeUCS2_DecodeUTF32
582-
PyUnicode_DecodeUTF32Stateful=python34.PyUnicodeUCS2_DecodeUTF32Stateful
583-
PyUnicode_DecodeUTF8=python34.PyUnicodeUCS2_DecodeUTF8
584-
PyUnicode_DecodeUTF8Stateful=python34.PyUnicodeUCS2_DecodeUTF8Stateful
585-
PyUnicode_DecodeUnicodeEscape=python34.PyUnicodeUCS2_DecodeUnicodeEscape
586-
PyUnicode_FSConverter=python34.PyUnicodeUCS2_FSConverter
587-
PyUnicode_FSDecoder=python34.PyUnicodeUCS2_FSDecoder
588-
PyUnicode_Find=python34.PyUnicodeUCS2_Find
589-
PyUnicode_Format=python34.PyUnicodeUCS2_Format
590-
PyUnicode_FromEncodedObject=python34.PyUnicodeUCS2_FromEncodedObject
591-
PyUnicode_FromFormat=python34.PyUnicodeUCS2_FromFormat
592-
PyUnicode_FromFormatV=python34.PyUnicodeUCS2_FromFormatV
593-
PyUnicode_FromObject=python34.PyUnicodeUCS2_FromObject
594-
PyUnicode_FromOrdinal=python34.PyUnicodeUCS2_FromOrdinal
595-
PyUnicode_FromString=python34.PyUnicodeUCS2_FromString
596-
PyUnicode_FromStringAndSize=python34.PyUnicodeUCS2_FromStringAndSize
597-
PyUnicode_FromWideChar=python34.PyUnicodeUCS2_FromWideChar
598-
PyUnicode_GetDefaultEncoding=python34.PyUnicodeUCS2_GetDefaultEncoding
599-
PyUnicode_GetSize=python34.PyUnicodeUCS2_GetSize
600-
PyUnicode_IsIdentifier=python34.PyUnicodeUCS2_IsIdentifier
601-
PyUnicode_Join=python34.PyUnicodeUCS2_Join
602-
PyUnicode_Partition=python34.PyUnicodeUCS2_Partition
603-
PyUnicode_RPartition=python34.PyUnicodeUCS2_RPartition
604-
PyUnicode_RSplit=python34.PyUnicodeUCS2_RSplit
605-
PyUnicode_Replace=python34.PyUnicodeUCS2_Replace
606-
PyUnicode_Resize=python34.PyUnicodeUCS2_Resize
607-
PyUnicode_RichCompare=python34.PyUnicodeUCS2_RichCompare
608-
PyUnicode_SetDefaultEncoding=python34.PyUnicodeUCS2_SetDefaultEncoding
609-
PyUnicode_Split=python34.PyUnicodeUCS2_Split
610-
PyUnicode_Splitlines=python34.PyUnicodeUCS2_Splitlines
611-
PyUnicode_Tailmatch=python34.PyUnicodeUCS2_Tailmatch
612-
PyUnicode_Translate=python34.PyUnicodeUCS2_Translate
551+
PyUnicode_Append=python34.PyUnicode_Append
552+
PyUnicode_AppendAndDel=python34.PyUnicode_AppendAndDel
553+
PyUnicode_AsASCIIString=python34.PyUnicode_AsASCIIString
554+
PyUnicode_AsCharmapString=python34.PyUnicode_AsCharmapString
555+
PyUnicode_AsDecodedObject=python34.PyUnicode_AsDecodedObject
556+
PyUnicode_AsDecodedUnicode=python34.PyUnicode_AsDecodedUnicode
557+
PyUnicode_AsEncodedObject=python34.PyUnicode_AsEncodedObject
558+
PyUnicode_AsEncodedString=python34.PyUnicode_AsEncodedString
559+
PyUnicode_AsEncodedUnicode=python34.PyUnicode_AsEncodedUnicode
560+
PyUnicode_AsLatin1String=python34.PyUnicode_AsLatin1String
561+
PyUnicode_AsRawUnicodeEscapeString=python34.PyUnicode_AsRawUnicodeEscapeString
562+
PyUnicode_AsUTF16String=python34.PyUnicode_AsUTF16String
563+
PyUnicode_AsUTF32String=python34.PyUnicode_AsUTF32String
564+
PyUnicode_AsUTF8String=python34.PyUnicode_AsUTF8String
565+
PyUnicode_AsUnicodeEscapeString=python34.PyUnicode_AsUnicodeEscapeString
566+
PyUnicode_AsWideChar=python34.PyUnicode_AsWideChar
567+
PyUnicode_ClearFreelist=python34.PyUnicode_ClearFreelist
568+
PyUnicode_Compare=python34.PyUnicode_Compare
569+
PyUnicode_Concat=python34.PyUnicode_Concat
570+
PyUnicode_Contains=python34.PyUnicode_Contains
571+
PyUnicode_Count=python34.PyUnicode_Count
572+
PyUnicode_Decode=python34.PyUnicode_Decode
573+
PyUnicode_DecodeASCII=python34.PyUnicode_DecodeASCII
574+
PyUnicode_DecodeCharmap=python34.PyUnicode_DecodeCharmap
575+
PyUnicode_DecodeFSDefault=python34.PyUnicode_DecodeFSDefault
576+
PyUnicode_DecodeFSDefaultAndSize=python34.PyUnicode_DecodeFSDefaultAndSize
577+
PyUnicode_DecodeLatin1=python34.PyUnicode_DecodeLatin1
578+
PyUnicode_DecodeRawUnicodeEscape=python34.PyUnicode_DecodeRawUnicodeEscape
579+
PyUnicode_DecodeUTF16=python34.PyUnicode_DecodeUTF16
580+
PyUnicode_DecodeUTF16Stateful=python34.PyUnicode_DecodeUTF16Stateful
581+
PyUnicode_DecodeUTF32=python34.PyUnicode_DecodeUTF32
582+
PyUnicode_DecodeUTF32Stateful=python34.PyUnicode_DecodeUTF32Stateful
583+
PyUnicode_DecodeUTF8=python34.PyUnicode_DecodeUTF8
584+
PyUnicode_DecodeUTF8Stateful=python34.PyUnicode_DecodeUTF8Stateful
585+
PyUnicode_DecodeUnicodeEscape=python34.PyUnicode_DecodeUnicodeEscape
586+
PyUnicode_FSConverter=python34.PyUnicode_FSConverter
587+
PyUnicode_FSDecoder=python34.PyUnicode_FSDecoder
588+
PyUnicode_Find=python34.PyUnicode_Find
589+
PyUnicode_Format=python34.PyUnicode_Format
590+
PyUnicode_FromEncodedObject=python34.PyUnicode_FromEncodedObject
591+
PyUnicode_FromFormat=python34.PyUnicode_FromFormat
592+
PyUnicode_FromFormatV=python34.PyUnicode_FromFormatV
593+
PyUnicode_FromObject=python34.PyUnicode_FromObject
594+
PyUnicode_FromOrdinal=python34.PyUnicode_FromOrdinal
595+
PyUnicode_FromString=python34.PyUnicode_FromString
596+
PyUnicode_FromStringAndSize=python34.PyUnicode_FromStringAndSize
597+
PyUnicode_FromWideChar=python34.PyUnicode_FromWideChar
598+
PyUnicode_GetDefaultEncoding=python34.PyUnicode_GetDefaultEncoding
599+
PyUnicode_GetSize=python34.PyUnicode_GetSize
600+
PyUnicode_IsIdentifier=python34.PyUnicode_IsIdentifier
601+
PyUnicode_Join=python34.PyUnicode_Join
602+
PyUnicode_Partition=python34.PyUnicode_Partition
603+
PyUnicode_RPartition=python34.PyUnicode_RPartition
604+
PyUnicode_RSplit=python34.PyUnicode_RSplit
605+
PyUnicode_Replace=python34.PyUnicode_Replace
606+
PyUnicode_Resize=python34.PyUnicode_Resize
607+
PyUnicode_RichCompare=python34.PyUnicode_RichCompare
608+
PyUnicode_SetDefaultEncoding=python34.PyUnicode_SetDefaultEncoding
609+
PyUnicode_Split=python34.PyUnicode_Split
610+
PyUnicode_Splitlines=python34.PyUnicode_Splitlines
611+
PyUnicode_Tailmatch=python34.PyUnicode_Tailmatch
612+
PyUnicode_Translate=python34.PyUnicode_Translate
613613
PyUnicode_BuildEncodingMap=python34.PyUnicode_BuildEncodingMap
614614
PyUnicode_CompareWithASCIIString=python34.PyUnicode_CompareWithASCIIString
615615
PyUnicode_DecodeUTF7=python34.PyUnicode_DecodeUTF7

0 commit comments

Comments
 (0)