[Python-checkins] cpython (merge 3.5 -> 3.6): Sort and remove duplicates from PC/python3.def (issue #23903).

Fri Dec 23 15:14:31 EST 2016

https://hg.python.org/cpython/rev/0927b5c80c50
changeset: 105797:0927b5c80c50
branch: 3.6
parent: 105794:a0aab1d2a8d6
parent: 105796:9cb87e53e324
user: Serhiy Storchaka <storchaka at gmail.com>
date: Fri Dec 23 22:11:57 2016 +0200
summary:
 Sort and remove duplicates from PC/python3.def (issue #23903).
files:
 PC/python3.def | 49 ++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/PC/python3.def b/PC/python3.def
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -318,6 +318,8 @@
 PyMemoryView_GetContiguous=python36.PyMemoryView_GetContiguous
 PyMemoryView_Type=python36.PyMemoryView_Type DATA
 PyMethodDescr_Type=python36.PyMethodDescr_Type DATA
+ PyModuleDef_Init=python36.PyModuleDef_Init
+ PyModuleDef_Type=python36.PyModuleDef_Type DATA
 PyModule_AddIntConstant=python36.PyModule_AddIntConstant
 PyModule_AddObject=python36.PyModule_AddObject
 PyModule_AddStringConstant=python36.PyModule_AddStringConstant
@@ -330,8 +332,6 @@
 PyModule_GetState=python36.PyModule_GetState
 PyModule_New=python36.PyModule_New
 PyModule_Type=python36.PyModule_Type DATA
- PyModuleDef_Init=python36.PyModuleDef_Init
- PyModuleDef_Type=python36.PyModuleDef_Type DATA
 PyNullImporter_Type=python36.PyNullImporter_Type DATA
 PyNumber_Absolute=python36.PyNumber_Absolute
 PyNumber_Add=python36.PyNumber_Add
@@ -368,6 +368,14 @@
 PyNumber_ToBase=python36.PyNumber_ToBase
 PyNumber_TrueDivide=python36.PyNumber_TrueDivide
 PyNumber_Xor=python36.PyNumber_Xor
+ PyODictItems_Type=python36.PyODictItems_Type DATA
+ PyODictIter_Type=python36.PyODictIter_Type DATA
+ PyODictKeys_Type=python36.PyODictKeys_Type DATA
+ PyODictValues_Type=python36.PyODictValues_Type DATA
+ PyODict_DelItem=python36.PyODict_DelItem
+ PyODict_New=python36.PyODict_New
+ PyODict_SetItem=python36.PyODict_SetItem
+ PyODict_Type=python36.PyODict_Type DATA
 PyOS_AfterFork=python36.PyOS_AfterFork
 PyOS_InitInterrupts=python36.PyOS_InitInterrupts
 PyOS_InputHook=python36.PyOS_InputHook DATA
@@ -434,14 +442,6 @@
 PyObject_Size=python36.PyObject_Size
 PyObject_Str=python36.PyObject_Str
 PyObject_Type=python36.PyObject_Type DATA
- PyODict_DelItem=python36.PyODict_DelItem
- PyODict_New=python36.PyODict_New
- PyODict_SetItem=python36.PyODict_SetItem
- PyODict_Type=python36.PyODict_Type DATA
- PyODictItems_Type=python36.PyODictItems_Type DATA
- PyODictIter_Type=python36.PyODictIter_Type DATA
- PyODictKeys_Type=python36.PyODictKeys_Type DATA
- PyODictValues_Type=python36.PyODictValues_Type DATA
 PyParser_SimpleParseFileFlags=python36.PyParser_SimpleParseFileFlags
 PyParser_SimpleParseStringFlags=python36.PyParser_SimpleParseStringFlags
 PyProperty_Type=python36.PyProperty_Type DATA
@@ -484,8 +484,8 @@
 PySlice_New=python36.PySlice_New
 PySlice_Type=python36.PySlice_Type DATA
 PySortWrapper_Type=python36.PySortWrapper_Type DATA
+ PyState_AddModule=python36.PyState_AddModule
 PyState_FindModule=python36.PyState_FindModule
- PyState_AddModule=python36.PyState_AddModule
 PyState_RemoveModule=python36.PyState_RemoveModule
 PyStructSequence_GetItem=python36.PyStructSequence_GetItem
 PyStructSequence_New=python36.PyStructSequence_New
@@ -577,8 +577,10 @@
 PyUnicode_AsUTF8String=python36.PyUnicode_AsUTF8String
 PyUnicode_AsUnicodeEscapeString=python36.PyUnicode_AsUnicodeEscapeString
 PyUnicode_AsWideChar=python36.PyUnicode_AsWideChar
+ PyUnicode_BuildEncodingMap=python36.PyUnicode_BuildEncodingMap
 PyUnicode_ClearFreelist=python36.PyUnicode_ClearFreelist
 PyUnicode_Compare=python36.PyUnicode_Compare
+ PyUnicode_CompareWithASCIIString=python36.PyUnicode_CompareWithASCIIString
 PyUnicode_Concat=python36.PyUnicode_Concat
 PyUnicode_Contains=python36.PyUnicode_Contains
 PyUnicode_Count=python36.PyUnicode_Count
@@ -593,9 +595,12 @@
 PyUnicode_DecodeUTF16Stateful=python36.PyUnicode_DecodeUTF16Stateful
 PyUnicode_DecodeUTF32=python36.PyUnicode_DecodeUTF32
 PyUnicode_DecodeUTF32Stateful=python36.PyUnicode_DecodeUTF32Stateful
+ PyUnicode_DecodeUTF7=python36.PyUnicode_DecodeUTF7
+ PyUnicode_DecodeUTF7Stateful=python36.PyUnicode_DecodeUTF7Stateful
 PyUnicode_DecodeUTF8=python36.PyUnicode_DecodeUTF8
 PyUnicode_DecodeUTF8Stateful=python36.PyUnicode_DecodeUTF8Stateful
 PyUnicode_DecodeUnicodeEscape=python36.PyUnicode_DecodeUnicodeEscape
+ PyUnicode_EncodeFSDefault=python36.PyUnicode_EncodeFSDefault
 PyUnicode_FSConverter=python36.PyUnicode_FSConverter
 PyUnicode_FSDecoder=python36.PyUnicode_FSDecoder
 PyUnicode_Find=python36.PyUnicode_Find
@@ -610,6 +615,9 @@
 PyUnicode_FromWideChar=python36.PyUnicode_FromWideChar
 PyUnicode_GetDefaultEncoding=python36.PyUnicode_GetDefaultEncoding
 PyUnicode_GetSize=python36.PyUnicode_GetSize
+ PyUnicode_InternFromString=python36.PyUnicode_InternFromString
+ PyUnicode_InternImmortal=python36.PyUnicode_InternImmortal
+ PyUnicode_InternInPlace=python36.PyUnicode_InternInPlace
 PyUnicode_IsIdentifier=python36.PyUnicode_IsIdentifier
 PyUnicode_Join=python36.PyUnicode_Join
 PyUnicode_Partition=python36.PyUnicode_Partition
@@ -623,14 +631,6 @@
 PyUnicode_Splitlines=python36.PyUnicode_Splitlines
 PyUnicode_Tailmatch=python36.PyUnicode_Tailmatch
 PyUnicode_Translate=python36.PyUnicode_Translate
- PyUnicode_BuildEncodingMap=python36.PyUnicode_BuildEncodingMap
- PyUnicode_CompareWithASCIIString=python36.PyUnicode_CompareWithASCIIString
- PyUnicode_DecodeUTF7=python36.PyUnicode_DecodeUTF7
- PyUnicode_DecodeUTF7Stateful=python36.PyUnicode_DecodeUTF7Stateful
- PyUnicode_EncodeFSDefault=python36.PyUnicode_EncodeFSDefault
- PyUnicode_InternFromString=python36.PyUnicode_InternFromString
- PyUnicode_InternImmortal=python36.PyUnicode_InternImmortal
- PyUnicode_InternInPlace=python36.PyUnicode_InternInPlace
 PyUnicode_Type=python36.PyUnicode_Type DATA
 PyWeakref_GetObject=python36.PyWeakref_GetObject DATA
 PyWeakref_NewProxy=python36.PyWeakref_NewProxy
@@ -676,6 +676,11 @@
 Py_SetRecursionLimit=python36.Py_SetRecursionLimit
 Py_SymtableString=python36.Py_SymtableString
 Py_VaBuildValue=python36.Py_VaBuildValue
+ _PyArg_ParseTupleAndKeywords_SizeT=python36._PyArg_ParseTupleAndKeywords_SizeT
+ _PyArg_ParseTuple_SizeT=python36._PyArg_ParseTuple_SizeT
+ _PyArg_Parse_SizeT=python36._PyArg_Parse_SizeT
+ _PyArg_VaParseTupleAndKeywords_SizeT=python36._PyArg_VaParseTupleAndKeywords_SizeT
+ _PyArg_VaParse_SizeT=python36._PyArg_VaParse_SizeT
 _PyErr_BadInternalCall=python36._PyErr_BadInternalCall
 _PyObject_CallFunction_SizeT=python36._PyObject_CallFunction_SizeT
 _PyObject_CallMethod_SizeT=python36._PyObject_CallMethod_SizeT
@@ -706,9 +711,3 @@
 _Py_SwappedOp=python36._Py_SwappedOp DATA
 _Py_TrueStruct=python36._Py_TrueStruct DATA
 _Py_VaBuildValue_SizeT=python36._Py_VaBuildValue_SizeT
- _PyArg_Parse_SizeT=python36._PyArg_Parse_SizeT
- _PyArg_ParseTuple_SizeT=python36._PyArg_ParseTuple_SizeT
- _PyArg_ParseTupleAndKeywords_SizeT=python36._PyArg_ParseTupleAndKeywords_SizeT
- _PyArg_VaParse_SizeT=python36._PyArg_VaParse_SizeT
- _PyArg_VaParseTupleAndKeywords_SizeT=python36._PyArg_VaParseTupleAndKeywords_SizeT
- _Py_BuildValue_SizeT=python36._Py_BuildValue_SizeT
-- 
Repository URL: https://hg.python.org/cpython
