Merge from 3.5.

This commit is contained in:
Eric Snow 2015-05-30 14:26:40 -06:00
commit 59b2f6803c

View file

@ -434,6 +434,14 @@ EXPORTS
PyObject_Size=python36.PyObject_Size
PyObject_Str=python36.PyObject_Str
PyObject_Type=python36.PyObject_Type DATA
PyODict_DelItem=python35.PyODict_DelItem
PyODict_New=python35.PyODict_New
PyODict_SetItem=python35.PyODict_SetItem
PyODict_Type=python35.PyODict_Type DATA
PyODictItems_Type=python35.PyODictItems_Type DATA
PyODictIter_Type=python35.PyODictIter_Type DATA
PyODictKeys_Type=python35.PyODictKeys_Type DATA
PyODictValues_Type=python35.PyODictValues_Type DATA
PyParser_SimpleParseFileFlags=python36.PyParser_SimpleParseFileFlags
PyParser_SimpleParseStringFlags=python36.PyParser_SimpleParseStringFlags
PyProperty_Type=python36.PyProperty_Type DATA