diff -r 48b9d9cdfe3b Include/boolobject.h --- a/Include/boolobject.h Sat Dec 24 10:53:18 2016 +0000 +++ b/Include/boolobject.h Sat Dec 24 23:22:19 2016 +0200 @@ -15,7 +15,8 @@ PyAPI_DATA(PyTypeObject) PyBool_Type; Don't forget to apply Py_INCREF() when returning either!!! */ /* Don't use these directly */ -PyAPI_DATA(struct _longobject) _Py_FalseStruct, _Py_TrueStruct; +PyAPI_DATA(struct _longobject) _Py_FalseStruct; +PyAPI_DATA(struct _longobject) _Py_TrueStruct; /* Use these macros */ #define Py_False ((PyObject *) &_Py_FalseStruct) diff -r 48b9d9cdfe3b Include/iterobject.h --- a/Include/iterobject.h Sat Dec 24 10:53:18 2016 +0000 +++ b/Include/iterobject.h Sat Dec 24 23:22:19 2016 +0200 @@ -7,7 +7,6 @@ extern "C" { PyAPI_DATA(PyTypeObject) PySeqIter_Type; PyAPI_DATA(PyTypeObject) PyCallIter_Type; -PyAPI_DATA(PyTypeObject) PyCmpWrapper_Type; #define PySeqIter_Check(op) (Py_TYPE(op) == &PySeqIter_Type) diff -r 48b9d9cdfe3b Include/pyerrors.h --- a/Include/pyerrors.h Sat Dec 24 10:53:18 2016 +0000 +++ b/Include/pyerrors.h Sat Dec 24 23:22:19 2016 +0200 @@ -293,9 +293,6 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromW PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int); #endif /* MS_WINDOWS */ -PyAPI_FUNC(PyObject *) PyErr_SetExcWithArgsKwargs(PyObject *, PyObject *, - PyObject *); - PyAPI_FUNC(PyObject *) PyErr_SetImportErrorSubclass(PyObject *, PyObject *, PyObject *, PyObject *); PyAPI_FUNC(PyObject *) PyErr_SetImportError(PyObject *, PyObject *, diff -r 48b9d9cdfe3b PC/python3.def --- a/PC/python3.def Sat Dec 24 10:53:18 2016 +0000 +++ b/PC/python3.def Sat Dec 24 23:22:19 2016 +0200 @@ -68,6 +68,7 @@ EXPORTS PyCodec_IncrementalEncoder=python36.PyCodec_IncrementalEncoder PyCodec_KnownEncoding=python36.PyCodec_KnownEncoding PyCodec_LookupError=python36.PyCodec_LookupError + PyCodec_NameReplaceErrors=python36.PyCodec_NameReplaceErrors PyCodec_Register=python36.PyCodec_Register PyCodec_RegisterError=python36.PyCodec_RegisterError PyCodec_ReplaceErrors=python36.PyCodec_ReplaceErrors @@ -122,6 +123,7 @@ EXPORTS PyErr_Fetch=python36.PyErr_Fetch PyErr_Format=python36.PyErr_Format PyErr_FormatV=python36.PyErr_FormatV + PyErr_GetExcInfo=python36.PyErr_GetExcInfo PyErr_GivenExceptionMatches=python36.PyErr_GivenExceptionMatches PyErr_NewException=python36.PyErr_NewException PyErr_NewExceptionWithDoc=python36.PyErr_NewExceptionWithDoc @@ -131,15 +133,21 @@ EXPORTS PyErr_Print=python36.PyErr_Print PyErr_PrintEx=python36.PyErr_PrintEx PyErr_ProgramText=python36.PyErr_ProgramText + PyErr_ResourceWarning=python36.PyErr_ResourceWarning PyErr_Restore=python36.PyErr_Restore + PyErr_SetExcInfo=python36.PyErr_SetExcInfo PyErr_SetFromErrno=python36.PyErr_SetFromErrno PyErr_SetFromErrnoWithFilename=python36.PyErr_SetFromErrnoWithFilename PyErr_SetFromErrnoWithFilenameObject=python36.PyErr_SetFromErrnoWithFilenameObject + PyErr_SetFromErrnoWithFilenameObjects=python36.PyErr_SetFromErrnoWithFilenameObjects + PyErr_SetImportError=python36.PyErr_SetImportError + PyErr_SetImportErrorSubclass=python36.PyErr_SetImportErrorSubclass PyErr_SetInterrupt=python36.PyErr_SetInterrupt PyErr_SetNone=python36.PyErr_SetNone PyErr_SetObject=python36.PyErr_SetObject PyErr_SetString=python36.PyErr_SetString PyErr_SyntaxLocation=python36.PyErr_SyntaxLocation + PyErr_SyntaxLocationEx=python36.PyErr_SyntaxLocationEx PyErr_WarnEx=python36.PyErr_WarnEx PyErr_WarnExplicit=python36.PyErr_WarnExplicit PyErr_WarnFormat=python36.PyErr_WarnFormat @@ -171,12 +179,21 @@ EXPORTS PyExc_AssertionError=python36.PyExc_AssertionError DATA PyExc_AttributeError=python36.PyExc_AttributeError DATA PyExc_BaseException=python36.PyExc_BaseException DATA + PyExc_BlockingIOError=python36.PyExc_BlockingIOError DATA + PyExc_BrokenPipeError=python36.PyExc_BrokenPipeError DATA PyExc_BufferError=python36.PyExc_BufferError DATA PyExc_BytesWarning=python36.PyExc_BytesWarning DATA + PyExc_ChildProcessError=python36.PyExc_ChildProcessError DATA + PyExc_ConnectionAbortedError=python36.PyExc_ConnectionAbortedError DATA + PyExc_ConnectionError=python36.PyExc_ConnectionError DATA + PyExc_ConnectionRefusedError=python36.PyExc_ConnectionRefusedError DATA + PyExc_ConnectionResetError=python36.PyExc_ConnectionResetError DATA PyExc_DeprecationWarning=python36.PyExc_DeprecationWarning DATA PyExc_EOFError=python36.PyExc_EOFError DATA PyExc_EnvironmentError=python36.PyExc_EnvironmentError DATA PyExc_Exception=python36.PyExc_Exception DATA + PyExc_FileExistsError=python36.PyExc_FileExistsError DATA + PyExc_FileNotFoundError=python36.PyExc_FileNotFoundError DATA PyExc_FloatingPointError=python36.PyExc_FloatingPointError DATA PyExc_FutureWarning=python36.PyExc_FutureWarning DATA PyExc_GeneratorExit=python36.PyExc_GeneratorExit DATA @@ -185,26 +202,35 @@ EXPORTS PyExc_ImportWarning=python36.PyExc_ImportWarning DATA PyExc_IndentationError=python36.PyExc_IndentationError DATA PyExc_IndexError=python36.PyExc_IndexError DATA + PyExc_InterruptedError=python36.PyExc_InterruptedError DATA + PyExc_IsADirectoryError=python36.PyExc_IsADirectoryError DATA PyExc_KeyError=python36.PyExc_KeyError DATA PyExc_KeyboardInterrupt=python36.PyExc_KeyboardInterrupt DATA PyExc_LookupError=python36.PyExc_LookupError DATA PyExc_MemoryError=python36.PyExc_MemoryError DATA - PyExc_MemoryErrorInst=python36.PyExc_MemoryErrorInst DATA + PyExc_ModuleNotFoundError=python36.PyExc_ModuleNotFoundError DATA PyExc_NameError=python36.PyExc_NameError DATA + PyExc_NotADirectoryError=python36.PyExc_NotADirectoryError DATA PyExc_NotImplementedError=python36.PyExc_NotImplementedError DATA PyExc_OSError=python36.PyExc_OSError DATA PyExc_OverflowError=python36.PyExc_OverflowError DATA PyExc_PendingDeprecationWarning=python36.PyExc_PendingDeprecationWarning DATA + PyExc_PermissionError=python36.PyExc_PermissionError DATA + PyExc_ProcessLookupError=python36.PyExc_ProcessLookupError DATA + PyExc_RecursionError=python36.PyExc_RecursionError DATA PyExc_RecursionErrorInst=python36.PyExc_RecursionErrorInst DATA PyExc_ReferenceError=python36.PyExc_ReferenceError DATA + PyExc_ResourceWarning=python36.PyExc_ResourceWarning DATA PyExc_RuntimeError=python36.PyExc_RuntimeError DATA PyExc_RuntimeWarning=python36.PyExc_RuntimeWarning DATA + PyExc_StopAsyncIteration=python36.PyExc_StopAsyncIteration DATA PyExc_StopIteration=python36.PyExc_StopIteration DATA PyExc_SyntaxError=python36.PyExc_SyntaxError DATA PyExc_SyntaxWarning=python36.PyExc_SyntaxWarning DATA PyExc_SystemError=python36.PyExc_SystemError DATA PyExc_SystemExit=python36.PyExc_SystemExit DATA PyExc_TabError=python36.PyExc_TabError DATA + PyExc_TimeoutError=python36.PyExc_TimeoutError DATA PyExc_TypeError=python36.PyExc_TypeError DATA PyExc_UnboundLocalError=python36.PyExc_UnboundLocalError DATA PyExc_UnicodeDecodeError=python36.PyExc_UnicodeDecodeError DATA @@ -242,10 +268,12 @@ EXPORTS PyGILState_Release=python36.PyGILState_Release PyGetSetDescr_Type=python36.PyGetSetDescr_Type DATA PyImport_AddModule=python36.PyImport_AddModule + PyImport_AddModuleObject=python36.PyImport_AddModuleObject PyImport_AppendInittab=python36.PyImport_AppendInittab PyImport_Cleanup=python36.PyImport_Cleanup PyImport_ExecCodeModule=python36.PyImport_ExecCodeModule PyImport_ExecCodeModuleEx=python36.PyImport_ExecCodeModuleEx + PyImport_ExecCodeModuleObject=python36.PyImport_ExecCodeModuleObject PyImport_ExecCodeModuleWithPathnames=python36.PyImport_ExecCodeModuleWithPathnames PyImport_GetImporter=python36.PyImport_GetImporter PyImport_GetMagicNumber=python36.PyImport_GetMagicNumber @@ -253,8 +281,10 @@ EXPORTS PyImport_GetModuleDict=python36.PyImport_GetModuleDict PyImport_Import=python36.PyImport_Import PyImport_ImportFrozenModule=python36.PyImport_ImportFrozenModule + PyImport_ImportFrozenModuleObject=python36.PyImport_ImportFrozenModuleObject PyImport_ImportModule=python36.PyImport_ImportModule PyImport_ImportModuleLevel=python36.PyImport_ImportModuleLevel + PyImport_ImportModuleLevelObject=python36.PyImport_ImportModuleLevelObject PyImport_ImportModuleNoBlock=python36.PyImport_ImportModuleNoBlock PyImport_ReloadModule=python36.PyImport_ReloadModule PyInterpreterState_Clear=python36.PyInterpreterState_Clear @@ -310,27 +340,35 @@ EXPORTS PyMapping_SetItemString=python36.PyMapping_SetItemString PyMapping_Size=python36.PyMapping_Size PyMapping_Values=python36.PyMapping_Values + PyMem_Calloc=python36.PyMem_Calloc PyMem_Free=python36.PyMem_Free PyMem_Malloc=python36.PyMem_Malloc PyMem_Realloc=python36.PyMem_Realloc PyMemberDescr_Type=python36.PyMemberDescr_Type DATA + PyMemoryView_FromMemory=python36.PyMemoryView_FromMemory PyMemoryView_FromObject=python36.PyMemoryView_FromObject 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_AddFunctions=python36.PyModule_AddFunctions PyModule_AddIntConstant=python36.PyModule_AddIntConstant PyModule_AddObject=python36.PyModule_AddObject PyModule_AddStringConstant=python36.PyModule_AddStringConstant PyModule_Create2=python36.PyModule_Create2 + PyModule_ExecDef=python36.PyModule_ExecDef + PyModule_FromDefAndSpec2=python36.PyModule_FromDefAndSpec2 PyModule_GetDef=python36.PyModule_GetDef PyModule_GetDict=python36.PyModule_GetDict PyModule_GetFilename=python36.PyModule_GetFilename PyModule_GetFilenameObject=python36.PyModule_GetFilenameObject PyModule_GetName=python36.PyModule_GetName + PyModule_GetNameObject=python36.PyModule_GetNameObject PyModule_GetState=python36.PyModule_GetState PyModule_New=python36.PyModule_New + PyModule_NewObject=python36.PyModule_NewObject + PyModule_SetDocString=python36.PyModule_SetDocString PyModule_Type=python36.PyModule_Type DATA PyNullImporter_Type=python36.PyNullImporter_Type DATA PyNumber_Absolute=python36.PyNumber_Absolute @@ -345,6 +383,7 @@ EXPORTS PyNumber_InPlaceAnd=python36.PyNumber_InPlaceAnd PyNumber_InPlaceFloorDivide=python36.PyNumber_InPlaceFloorDivide PyNumber_InPlaceLshift=python36.PyNumber_InPlaceLshift + PyNumber_InPlaceMatrixMultiply=python36.PyNumber_InPlaceMatrixMultiply PyNumber_InPlaceMultiply=python36.PyNumber_InPlaceMultiply PyNumber_InPlaceOr=python36.PyNumber_InPlaceOr PyNumber_InPlacePower=python36.PyNumber_InPlacePower @@ -357,6 +396,7 @@ EXPORTS PyNumber_Invert=python36.PyNumber_Invert PyNumber_Long=python36.PyNumber_Long PyNumber_Lshift=python36.PyNumber_Lshift + PyNumber_MatrixMultiply=python36.PyNumber_MatrixMultiply PyNumber_Multiply=python36.PyNumber_Multiply PyNumber_Negative=python36.PyNumber_Negative PyNumber_Or=python36.PyNumber_Or @@ -377,6 +417,7 @@ EXPORTS PyODict_SetItem=python36.PyODict_SetItem PyODict_Type=python36.PyODict_Type DATA PyOS_AfterFork=python36.PyOS_AfterFork + PyOS_FSPath=python36.PyOS_FSPath PyOS_InitInterrupts=python36.PyOS_InitInterrupts PyOS_InputHook=python36.PyOS_InputHook DATA PyOS_InterruptOccurred=python36.PyOS_InterruptOccurred @@ -403,6 +444,7 @@ EXPORTS PyObject_CallMethod=python36.PyObject_CallMethod PyObject_CallMethodObjArgs=python36.PyObject_CallMethodObjArgs PyObject_CallObject=python36.PyObject_CallObject + PyObject_Calloc=python36.PyObject_Calloc PyObject_CheckReadBuffer=python36.PyObject_CheckReadBuffer PyObject_ClearWeakRefs=python36.PyObject_ClearWeakRefs PyObject_DelItem=python36.PyObject_DelItem @@ -415,6 +457,7 @@ EXPORTS PyObject_GC_UnTrack=python36.PyObject_GC_UnTrack PyObject_GenericGetAttr=python36.PyObject_GenericGetAttr PyObject_GenericSetAttr=python36.PyObject_GenericSetAttr + PyObject_GenericSetDict=python36.PyObject_GenericSetDict PyObject_GetAttr=python36.PyObject_GetAttr PyObject_GetAttrString=python36.PyObject_GetAttrString PyObject_GetItem=python36.PyObject_GetItem @@ -441,9 +484,10 @@ EXPORTS PyObject_SetItem=python36.PyObject_SetItem PyObject_Size=python36.PyObject_Size PyObject_Str=python36.PyObject_Str - PyObject_Type=python36.PyObject_Type DATA + PyObject_Type=python36.PyObject_Type PyParser_SimpleParseFileFlags=python36.PyParser_SimpleParseFileFlags PyParser_SimpleParseStringFlags=python36.PyParser_SimpleParseStringFlags + PyParser_SimpleParseStringFlagsFilename=python36.PyParser_SimpleParseStringFlagsFilename PyProperty_Type=python36.PyProperty_Type DATA PyRangeIter_Type=python36.PyRangeIter_Type DATA PyRange_Type=python36.PyRange_Type DATA @@ -494,9 +538,11 @@ EXPORTS PySuper_Type=python36.PySuper_Type DATA PySys_AddWarnOption=python36.PySys_AddWarnOption PySys_AddWarnOptionUnicode=python36.PySys_AddWarnOptionUnicode + PySys_AddXOption=python36.PySys_AddXOption PySys_FormatStderr=python36.PySys_FormatStderr PySys_FormatStdout=python36.PySys_FormatStdout PySys_GetObject=python36.PySys_GetObject + PySys_GetXOptions=python36.PySys_GetXOptions PySys_HasWarnOptions=python36.PySys_HasWarnOptions PySys_ResetWarnOptions=python36.PySys_ResetWarnOptions PySys_SetArgv=python36.PySys_SetArgv @@ -572,13 +618,16 @@ EXPORTS PyUnicode_AsEncodedUnicode=python36.PyUnicode_AsEncodedUnicode PyUnicode_AsLatin1String=python36.PyUnicode_AsLatin1String PyUnicode_AsRawUnicodeEscapeString=python36.PyUnicode_AsRawUnicodeEscapeString + PyUnicode_AsUCS4=python36.PyUnicode_AsUCS4 + PyUnicode_AsUCS4Copy=python36.PyUnicode_AsUCS4Copy PyUnicode_AsUTF16String=python36.PyUnicode_AsUTF16String PyUnicode_AsUTF32String=python36.PyUnicode_AsUTF32String PyUnicode_AsUTF8String=python36.PyUnicode_AsUTF8String PyUnicode_AsUnicodeEscapeString=python36.PyUnicode_AsUnicodeEscapeString PyUnicode_AsWideChar=python36.PyUnicode_AsWideChar + PyUnicode_AsWideCharString=python36.PyUnicode_AsWideCharString PyUnicode_BuildEncodingMap=python36.PyUnicode_BuildEncodingMap - PyUnicode_ClearFreelist=python36.PyUnicode_ClearFreelist + PyUnicode_ClearFreeList=python36.PyUnicode_ClearFreeList PyUnicode_Compare=python36.PyUnicode_Compare PyUnicode_CompareWithASCIIString=python36.PyUnicode_CompareWithASCIIString PyUnicode_Concat=python36.PyUnicode_Concat @@ -590,6 +639,8 @@ EXPORTS PyUnicode_DecodeFSDefault=python36.PyUnicode_DecodeFSDefault PyUnicode_DecodeFSDefaultAndSize=python36.PyUnicode_DecodeFSDefaultAndSize PyUnicode_DecodeLatin1=python36.PyUnicode_DecodeLatin1 + PyUnicode_DecodeLocale=python36.PyUnicode_DecodeLocale + PyUnicode_DecodeLocaleAndSize=python36.PyUnicode_DecodeLocaleAndSize PyUnicode_DecodeRawUnicodeEscape=python36.PyUnicode_DecodeRawUnicodeEscape PyUnicode_DecodeUTF16=python36.PyUnicode_DecodeUTF16 PyUnicode_DecodeUTF16Stateful=python36.PyUnicode_DecodeUTF16Stateful @@ -601,9 +652,11 @@ EXPORTS PyUnicode_DecodeUTF8Stateful=python36.PyUnicode_DecodeUTF8Stateful PyUnicode_DecodeUnicodeEscape=python36.PyUnicode_DecodeUnicodeEscape PyUnicode_EncodeFSDefault=python36.PyUnicode_EncodeFSDefault + PyUnicode_EncodeLocale=python36.PyUnicode_EncodeLocale PyUnicode_FSConverter=python36.PyUnicode_FSConverter PyUnicode_FSDecoder=python36.PyUnicode_FSDecoder PyUnicode_Find=python36.PyUnicode_Find + PyUnicode_FindChar=python36.PyUnicode_FindChar PyUnicode_Format=python36.PyUnicode_Format PyUnicode_FromEncodedObject=python36.PyUnicode_FromEncodedObject PyUnicode_FromFormat=python36.PyUnicode_FromFormat @@ -614,6 +667,7 @@ EXPORTS PyUnicode_FromStringAndSize=python36.PyUnicode_FromStringAndSize PyUnicode_FromWideChar=python36.PyUnicode_FromWideChar PyUnicode_GetDefaultEncoding=python36.PyUnicode_GetDefaultEncoding + PyUnicode_GetLength=python36.PyUnicode_GetLength PyUnicode_GetSize=python36.PyUnicode_GetSize PyUnicode_InternFromString=python36.PyUnicode_InternFromString PyUnicode_InternImmortal=python36.PyUnicode_InternImmortal @@ -623,16 +677,18 @@ EXPORTS PyUnicode_Partition=python36.PyUnicode_Partition PyUnicode_RPartition=python36.PyUnicode_RPartition PyUnicode_RSplit=python36.PyUnicode_RSplit + PyUnicode_ReadChar=python36.PyUnicode_ReadChar PyUnicode_Replace=python36.PyUnicode_Replace PyUnicode_Resize=python36.PyUnicode_Resize PyUnicode_RichCompare=python36.PyUnicode_RichCompare - PyUnicode_SetDefaultEncoding=python36.PyUnicode_SetDefaultEncoding PyUnicode_Split=python36.PyUnicode_Split PyUnicode_Splitlines=python36.PyUnicode_Splitlines + PyUnicode_Substring=python36.PyUnicode_Substring PyUnicode_Tailmatch=python36.PyUnicode_Tailmatch PyUnicode_Translate=python36.PyUnicode_Translate PyUnicode_Type=python36.PyUnicode_Type DATA - PyWeakref_GetObject=python36.PyWeakref_GetObject DATA + PyUnicode_WriteChar=python36.PyUnicode_WriteChar + PyWeakref_GetObject=python36.PyWeakref_GetObject PyWeakref_NewProxy=python36.PyWeakref_NewProxy PyWeakref_NewRef=python36.PyWeakref_NewRef PyWrapperDescr_Type=python36.PyWrapperDescr_Type DATA @@ -643,9 +699,12 @@ EXPORTS Py_BuildValue=python36.Py_BuildValue Py_CompileString=python36.Py_CompileString Py_DecRef=python36.Py_DecRef + Py_DecodeLocale=python36.Py_DecodeLocale + Py_EncodeLocale=python36.Py_EncodeLocale Py_EndInterpreter=python36.Py_EndInterpreter Py_Exit=python36.Py_Exit Py_FatalError=python36.Py_FatalError + Py_FileSystemDefaultEncodeErrors=python36.Py_FileSystemDefaultEncodeErrors DATA Py_FileSystemDefaultEncoding=python36.Py_FileSystemDefaultEncoding DATA Py_Finalize=python36.Py_Finalize Py_FinalizeEx=python36.Py_FinalizeEx @@ -671,6 +730,7 @@ EXPORTS Py_NewInterpreter=python36.Py_NewInterpreter Py_ReprEnter=python36.Py_ReprEnter Py_ReprLeave=python36.Py_ReprLeave + Py_SetPath=python36.Py_SetPath Py_SetProgramName=python36.Py_SetProgramName Py_SetPythonHome=python36.Py_SetPythonHome Py_SetRecursionLimit=python36.Py_SetRecursionLimit @@ -697,6 +757,8 @@ EXPORTS _PyTrash_delete_nesting=python36._PyTrash_delete_nesting DATA _PyTrash_deposit_object=python36._PyTrash_deposit_object _PyTrash_destroy_chain=python36._PyTrash_destroy_chain + _PyTrash_thread_deposit_object=python36._PyTrash_thread_deposit_object + _PyTrash_thread_destroy_chain=python36._PyTrash_thread_destroy_chain _PyWeakref_CallableProxyType=python36._PyWeakref_CallableProxyType DATA _PyWeakref_ProxyType=python36._PyWeakref_ProxyType DATA _PyWeakref_RefType=python36._PyWeakref_RefType DATA