Skip to content

Commit bc94b45

Browse files
qunaibittimfel
qunaibit
authored and
timfel
committed
[GR-57401] Update Python to 3.12.8
PullRequest: graalpython/3532
2 parents b79401c + 43da30a commit bc94b45

File tree

1,714 files changed

+224863
-116980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,714 files changed

+224863
-116980
lines changed

‎ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "86a4d3d85b6a6a4778257dc9746356a5a5d36608" }
1+
{ "overlay": "d1b07bcbc3aec162c1a63abc3b81a574daae3963" }

‎graalpython/com.oracle.graal.python.cext/CAPIFunctions.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ PyCell_Get;PyObject*;PyObject*
5858
PyCell_New;PyObject*;PyObject*
5959
PyCell_Set;int;PyObject*|PyObject*
6060
PyClassMethod_New;PyObject*;PyObject*
61+
PyCode_AddWatcher;int;PyCode_WatchCallback
6162
PyCode_Addr2Line;int;PyCodeObject*|int
6263
PyCode_Addr2Location;int;PyCodeObject*|int|int*|int*|int*|int*
64+
PyCode_ClearWatcher;int;int
6365
PyCode_GetCellvars;PyObject*;PyCodeObject*
6466
PyCode_GetCode;PyObject*;PyCodeObject*
6567
PyCode_GetFreevars;PyObject*;PyCodeObject*
6668
PyCode_GetVarnames;PyObject*;PyCodeObject*
67-
PyCode_New;PyCodeObject*;int|int|int|int|int|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|int|PyObject*|PyObject*
6869
PyCode_NewEmpty;PyCodeObject*;const char*|const char*|int
69-
PyCode_NewWithPosOnlyArgs;PyCodeObject*;int|int|int|int|int|int|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|int|PyObject*|PyObject*
7070
PyCode_Optimize;PyObject*;PyObject*|PyObject*|PyObject*|PyObject*
7171
PyCodec_BackslashReplaceErrors;PyObject*;PyObject*
7272
PyCodec_Decode;PyObject*;PyObject*|const char*|const char*
@@ -263,6 +263,7 @@ PyFunction_SetAnnotations;int;PyObject*|PyObject*
263263
PyFunction_SetClosure;int;PyObject*|PyObject*
264264
PyFunction_SetDefaults;int;PyObject*|PyObject*
265265
PyFunction_SetKwDefaults;int;PyObject*|PyObject*
266+
PyFunction_SetVectorcall;void;PyFunctionObject*|vectorcallfunc
266267
PyGC_Collect;Py_ssize_t;void
267268
PyGC_Disable;int;void
268269
PyGC_Enable;int;void
@@ -736,8 +737,6 @@ PyUnicode_AsUTF32String;PyObject*;PyObject*
736737
PyUnicode_AsUTF8;const char*;PyObject*
737738
PyUnicode_AsUTF8AndSize;const char*;PyObject*|Py_ssize_t*
738739
PyUnicode_AsUTF8String;PyObject*;PyObject*
739-
PyUnicode_AsUnicode;Py_UNICODE*;PyObject*
740-
PyUnicode_AsUnicodeAndSize;Py_UNICODE*;PyObject*|Py_ssize_t*
741740
PyUnicode_AsUnicodeEscapeString;PyObject*;PyObject*
742741
PyUnicode_AsWideChar;Py_ssize_t;PyObject*|wchar_t*|Py_ssize_t
743742
PyUnicode_AsWideCharString;wchar_t*;PyObject*|Py_ssize_t*
@@ -782,13 +781,10 @@ PyUnicode_FromObject;PyObject*;PyObject*
782781
PyUnicode_FromOrdinal;PyObject*;int
783782
PyUnicode_FromString;PyObject*;const char*
784783
PyUnicode_FromStringAndSize;PyObject*;const char*|Py_ssize_t
785-
PyUnicode_FromUnicode;PyObject*;const Py_UNICODE*|Py_ssize_t
786784
PyUnicode_FromWideChar;PyObject*;const wchar_t*|Py_ssize_t
787785
PyUnicode_GetDefaultEncoding;const char*;void
788786
PyUnicode_GetLength;Py_ssize_t;PyObject*
789-
PyUnicode_GetSize;Py_ssize_t;PyObject*
790787
PyUnicode_InternFromString;PyObject*;const char*
791-
PyUnicode_InternImmortal;void;PyObject**
792788
PyUnicode_InternInPlace;void;PyObject**
793789
PyUnicode_IsIdentifier;int;PyObject*
794790
PyUnicode_Join;PyObject*;PyObject*|PyObject*
@@ -806,6 +802,10 @@ PyUnicode_Substring;PyObject*;PyObject*|Py_ssize_t|Py_ssize_t
806802
PyUnicode_Tailmatch;Py_ssize_t;PyObject*|PyObject*|Py_ssize_t|Py_ssize_t|int
807803
PyUnicode_Translate;PyObject*;PyObject*|PyObject*|const char*
808804
PyUnicode_WriteChar;int;PyObject*|Py_ssize_t|Py_UCS4
805+
PyUnstable_Code_GetExtra;int;PyObject*|Py_ssize_t|void**
806+
PyUnstable_Code_New;PyCodeObject*;int|int|int|int|int|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|int|PyObject*|PyObject*
807+
PyUnstable_Code_NewWithPosOnlyArgs;PyCodeObject*;int|int|int|int|int|int|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|PyObject*|int|PyObject*|PyObject*
808+
PyUnstable_Code_SetExtra;int;PyObject*|Py_ssize_t|void*
809809
PyVectorcall_Call;PyObject*;PyObject*|PyObject*|PyObject*
810810
PyVectorcall_Function;vectorcallfunc;PyObject*
811811
PyWeakref_GetObject;PyObject*;PyObject*
@@ -902,19 +902,21 @@ _PyBytes_Join;PyObject*;PyObject*|PyObject*
902902
_PyBytes_Resize;int;PyObject**|Py_ssize_t
903903
_PyCode_CheckLineNumber;int;int|PyCodeAddressRange*
904904
_PyCode_ConstantKey;PyObject*;PyObject*
905-
_PyCode_GetExtra;int;PyObject*|Py_ssize_t|void**
906-
_PyCode_SetExtra;int;PyObject*|Py_ssize_t|void*
907905
_PyCodecInfo_GetIncrementalDecoder;PyObject*;PyObject*|const char*
908906
_PyCodecInfo_GetIncrementalEncoder;PyObject*;PyObject*|const char*
909907
_PyCodec_DecodeText;PyObject*;PyObject*|const char*|const char*
910908
_PyCodec_EncodeText;PyObject*;PyObject*|const char*|const char*
911909
_PyCodec_Lookup;PyObject*;const char*
912910
_PyCodec_LookupTextEncoding;PyObject*;const char*|const char*
913911
_PyContext_NewHamtForTests;PyObject*;void
912+
_PyCrossInterpreterData_Clear;void;PyInterpreterState*|_PyCrossInterpreterData*
913+
_PyCrossInterpreterData_Init;void;_PyCrossInterpreterData*|PyInterpreterState*|void*|PyObject*|xid_newobjectfunc
914+
_PyCrossInterpreterData_InitWithSize;int;_PyCrossInterpreterData*|PyInterpreterState*|const size_t|PyObject*|xid_newobjectfunc
914915
_PyCrossInterpreterData_Lookup;crossinterpdatafunc;PyObject*
915916
_PyCrossInterpreterData_NewObject;PyObject*;_PyCrossInterpreterData*
916917
_PyCrossInterpreterData_RegisterClass;int;PyTypeObject*|crossinterpdatafunc
917-
_PyCrossInterpreterData_Release;void;_PyCrossInterpreterData*
918+
_PyCrossInterpreterData_Release;int;_PyCrossInterpreterData*
919+
_PyCrossInterpreterData_UnregisterClass;int;PyTypeObject*
918920
_PyDeadline_Get;_PyTime_t;_PyTime_t
919921
_PyDeadline_Init;_PyTime_t;_PyTime_t
920922
_PyDebugAllocatorStats;void;FILE*|const char*|int|size_t
@@ -941,6 +943,7 @@ _PyDict_SetItem_KnownHash;int;PyObject*|PyObject*|PyObject*|Py_hash_t
941943
_PyDict_SizeOf;Py_ssize_t;PyDictObject*
942944
_PyErr_BadInternalCall;void;const char*|int
943945
_PyErr_ChainExceptions;void;PyObject*|PyObject*|PyObject*
946+
_PyErr_ChainExceptions1;void;PyObject*
944947
_PyErr_CheckSignals;int;void
945948
_PyErr_FormatFromCause;PyObject*;PyObject*|const char*|...
946949
_PyErr_GetExcInfo;void;PyThreadState*|PyObject**|PyObject**|PyObject**
@@ -949,38 +952,38 @@ _PyErr_GetTopmostException;_PyErr_StackItem*;PyThreadState*
949952
_PyErr_ProgramDecodedTextObject;PyObject*;PyObject*|int|const char*
950953
_PyErr_SetHandledException;void;PyThreadState*|PyObject*
951954
_PyErr_SetKeyError;void;PyObject*
952-
_PyErr_TrySetFromCause;PyObject*;const char*|...
953955
_PyErr_WriteUnraisableMsg;void;const char*|PyObject*
954956
_PyEval_EvalFrameDefault;PyObject*;PyThreadState*|struct _PyInterpreterFrame*|int
955957
_PyEval_GetBuiltin;PyObject*;PyObject*
956958
_PyEval_GetBuiltinId;PyObject*;_Py_Identifier*
957959
_PyEval_GetSwitchInterval;unsigned long;void
958-
_PyEval_RequestCodeExtraIndex;Py_ssize_t;freefunc
959960
_PyEval_SetProfile;int;PyThreadState*|Py_tracefunc|PyObject*
960961
_PyEval_SetSwitchInterval;void;unsigned long
961962
_PyEval_SetTrace;int;PyThreadState*|Py_tracefunc|PyObject*
962963
_PyEval_SliceIndex;int;PyObject*|Py_ssize_t*
963964
_PyEval_SliceIndexNotNone;int;PyObject*|Py_ssize_t*
965+
PyUnstable_Eval_RequestCodeExtraIndex;Py_ssize_t;freefunc
964966
_PyFrame_IsEntryFrame;int;PyFrameObject*
965967
_PyFunction_Vectorcall;PyObject*;PyObject*|PyObject*const*|size_t|PyObject*
966968
_PyGILState_GetInterpreterStateUnsafe;PyInterpreterState*;void
967969
_PyGen_FetchStopIterationValue;int;PyObject**
968970
_PyGen_Finalize;void;PyObject*
969971
_PyGen_SetStopIterationValue;int;PyObject*
970-
_PyImport_AcquireLock;void;void
972+
_PyImport_AcquireLock;void;PyInterpreterState*
971973
_PyImport_FixupBuiltin;int;PyObject*|const char*|PyObject*
972974
_PyImport_FixupExtensionObject;int;PyObject*|PyObject*|PyObject*|PyObject*
973975
_PyImport_GetModuleAttr;PyObject*;PyObject*|PyObject*
974976
_PyImport_GetModuleAttrString;PyObject*;const char*|const char*
975977
_PyImport_GetModuleId;PyObject*;_Py_Identifier*
976978
_PyImport_IsInitialized;int;PyInterpreterState*
977-
_PyImport_ReleaseLock;int;void
979+
_PyImport_ReleaseLock;int;PyInterpreterState*
978980
_PyImport_SetModule;int;PyObject*|PyObject*
979981
_PyImport_SetModuleString;int;const char*|PyObject*
980982
_PyInterpreterState_GetConfig;const PyConfig*;PyInterpreterState*
981983
_PyInterpreterState_GetConfigCopy;int;struct PyConfig*
982984
_PyInterpreterState_GetEvalFrameFunc;_PyFrameEvalFunction;PyInterpreterState*
983985
_PyInterpreterState_GetMainModule;PyObject*;PyInterpreterState*
986+
_PyInterpreterState_HasFeature;int;PyInterpreterState*|unsigned long
984987
_PyInterpreterState_RequireIDRef;void;PyInterpreterState*|int
985988
_PyInterpreterState_RequiresIDRef;int;PyInterpreterState*
986989
_PyInterpreterState_SetConfig;int;const struct PyConfig*
@@ -1125,7 +1128,7 @@ _PyUnicodeWriter_Dealloc;void;_PyUnicodeWriter*
11251128
_PyUnicodeWriter_Finish;PyObject*;_PyUnicodeWriter*
11261129
_PyUnicodeWriter_Init;void;_PyUnicodeWriter*
11271130
_PyUnicodeWriter_PrepareInternal;int;_PyUnicodeWriter*|Py_ssize_t|Py_UCS4
1128-
_PyUnicodeWriter_PrepareKindInternal;int;_PyUnicodeWriter*|enum PyUnicode_Kind
1131+
_PyUnicodeWriter_PrepareKindInternal;int;_PyUnicodeWriter*|int
11291132
_PyUnicodeWriter_WriteASCIIString;int;_PyUnicodeWriter*|const char*|Py_ssize_t
11301133
_PyUnicodeWriter_WriteChar;int;_PyUnicodeWriter*|Py_UCS4
11311134
_PyUnicodeWriter_WriteLatin1String;int;_PyUnicodeWriter*|const char*|Py_ssize_t
@@ -1134,7 +1137,6 @@ _PyUnicodeWriter_WriteSubstring;int;_PyUnicodeWriter*|PyObject*|Py_ssize_t|Py_ss
11341137
_PyUnicode_AsASCIIString;PyObject*;PyObject*|const char*
11351138
_PyUnicode_AsLatin1String;PyObject*;PyObject*|const char*
11361139
_PyUnicode_AsUTF8String;PyObject*;PyObject*|const char*
1137-
_PyUnicode_AsUnicode;const Py_UNICODE*;PyObject*
11381140
_PyUnicode_CheckConsistency;int;PyObject*|int
11391141
_PyUnicode_Copy;PyObject*;PyObject*
11401142
_PyUnicode_DecodeRawUnicodeEscapeStateful;PyObject*;const char*|Py_ssize_t|const char*|Py_ssize_t*
@@ -1171,7 +1173,6 @@ _PyUnicode_IsWhitespace;int;const Py_UCS4
11711173
_PyUnicode_IsXidContinue;int;Py_UCS4
11721174
_PyUnicode_IsXidStart;int;Py_UCS4
11731175
_PyUnicode_JoinArray;PyObject*;PyObject*|PyObject*const*|Py_ssize_t
1174-
_PyUnicode_Ready;int;PyObject*
11751176
_PyUnicode_ScanIdentifier;Py_ssize_t;PyObject*
11761177
_PyUnicode_ToDecimalDigit;int;Py_UCS4
11771178
_PyUnicode_ToDigit;int;Py_UCS4
@@ -1210,7 +1211,6 @@ _Py_InitializeMain;PyStatus;void
12101211
_Py_IsCoreInitialized;int;void
12111212
_Py_IsFinalizing;int;void
12121213
_Py_LegacyLocaleDetected;int;int
1213-
_Py_NewInterpreter;PyThreadState*;int
12141214
_Py_NewReference;void;PyObject*
12151215
_Py_RestoreSignals;void;void
12161216
_Py_SetLocaleFromEnv;char*;int

‎graalpython/com.oracle.graal.python.cext/CMakeLists.txt

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,17 @@ if (MSVC)
7979
/wd4464 # relative include path contains '..'
8080
/wd4710 # 'fprintf': function not inlined
8181
/wd4706 # assignment within conditional expression
82+
/wd4774 # 'sprintf': format string expected in argument 2 is not a string literal
8283

8384
# Some that I'm not so happy about
8485
/wd4232 # sre: nonstandard extension used: 'ml_meth': address of dllimport 'Py_GenericAlias' is not static, identity not guaranteed
8586
/wd4191 # sre and sqlite: 'type cast': like unsafe conversion from 'PyObject *(__cdecl *)(MatchObject *,PyObject *const *,Py_ssize_t)' to 'void (__cdecl *)(void)'
8687
/wd4918 # sre: invalid character in pragma optimization list
8788
/wd4701 # cpython_unicodedata: potentially uninitialized local variable 'rc' used
89+
/wd4703 # unicodeobject.c:potentially uninitialized local pointer variable used
8890
/wd4574 # sqlite: 'SQLITE_ATOMIC_INTRINSICS' is defined to be '0': did you mean to use '#if SQLITE_ATOMIC_INTRINSICS'?
8991
/wd4310 # xmlparse: cast truncates constant value
92+
/wd4777 # format string '%zd' requires an argument of type 'unsigned __int64'
9093
)
9194
else()
9295
set(CFLAGS_WARNINGS -Wall -Werror -Wno-unused-function -Wno-unused-variable -Wno-unused-const-variable
@@ -105,6 +108,7 @@ endif()
105108
# preprocessor defines for all platforms
106109
add_compile_definitions(
107110
NDEBUG
111+
WITH_FREELISTS=1
108112
)
109113

110114

@@ -113,7 +117,7 @@ if(WIN32)
113117
MS_WINDOWS
114118
Py_ENABLE_SHARED
115119
HAVE_DECLSPEC_DLL
116-
120+
NTDDI_VERSION=NTDDI_WINBLUE
117121
)
118122
endif()
119123

@@ -235,12 +239,71 @@ set(SQLITE3_SRC
235239
)
236240
native_module("_sqlite3" TRUE "${SQLITE3_SRC}")
237241
target_include_directories("_sqlite3" PUBLIC "${SRC_DIR}/modules/_sqlite/sqlite")
238-
native_module("_sha3" TRUE "${SRC_DIR}/modules/_sha3/sha3module.c")
242+
243+
set(LIBHACL_HEADERS
244+
# "${SRC_DIR}/modules/_hacl/include/krml/FStar_UInt128_Verified.h"
245+
# "${SRC_DIR}/modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h"
246+
# "${SRC_DIR}/modules/_hacl/include/krml/fstar_uint128_struct_endianness.h"
247+
# "${SRC_DIR}/modules/_hacl/include/krml/internal/target.h"
248+
# "${SRC_DIR}/modules/_hacl/include/krml/lowstar_endianness.h"
249+
# "${SRC_DIR}/modules/_hacl/include/krml/types.h"
250+
# "${SRC_DIR}/modules/_hacl/Hacl_Streaming_Types.h"
251+
# "${SRC_DIR}/modules/_hacl/python_hacl_namespaces.h"
252+
"${SRC_DIR}/modules/_hacl/include"
253+
"${SRC_DIR}/modules/_hacl"
254+
)
255+
set(SHA3_SRC
256+
"${SRC_DIR}/modules/sha3module.c"
257+
"${SRC_DIR}/modules/_hacl/Hacl_Hash_SHA3.c"
258+
)
259+
native_module("_sha3" TRUE "${SHA3_SRC}")
260+
target_include_directories("_sha3" PUBLIC "${LIBHACL_HEADERS}")
261+
262+
set(TESTCAPI_SRC
263+
"${SRC_DIR}/modules/_testcapi/abstract.c"
264+
"${SRC_DIR}/modules/_testcapi/buffer.c"
265+
"${SRC_DIR}/modules/_testcapi/bytearray.c"
266+
"${SRC_DIR}/modules/_testcapi/bytes.c"
267+
# "${SRC_DIR}/modules/_testcapi/code.c"
268+
"${SRC_DIR}/modules/_testcapi/codec.c"
269+
"${SRC_DIR}/modules/_testcapi/complex.c"
270+
"${SRC_DIR}/modules/_testcapi/datetime.c"
271+
"${SRC_DIR}/modules/_testcapi/dict.c"
272+
"${SRC_DIR}/modules/_testcapi/docstring.c"
273+
"${SRC_DIR}/modules/_testcapi/exceptions.c"
274+
"${SRC_DIR}/modules/_testcapi/file.c"
275+
"${SRC_DIR}/modules/_testcapi/float.c"
276+
"${SRC_DIR}/modules/_testcapi/gc.c"
277+
"${SRC_DIR}/modules/_testcapi/getargs.c"
278+
"${SRC_DIR}/modules/_testcapi/heaptype.c"
279+
# "${SRC_DIR}/modules/_testcapi/heaptype_relative.c"
280+
"${SRC_DIR}/modules/_testcapi/immortal.c"
281+
"${SRC_DIR}/modules/_testcapi/list.c"
282+
"${SRC_DIR}/modules/_testcapi/long.c"
283+
"${SRC_DIR}/modules/_testcapi/mem.c"
284+
"${SRC_DIR}/modules/_testcapi/numbers.c"
285+
"${SRC_DIR}/modules/_testcapi/parts.h"
286+
"${SRC_DIR}/modules/_testcapi/pyos.c"
287+
"${SRC_DIR}/modules/_testcapi/pytime.c"
288+
"${SRC_DIR}/modules/_testcapi/run.c"
289+
"${SRC_DIR}/modules/_testcapi/set.c"
290+
"${SRC_DIR}/modules/_testcapi/structmember.c"
291+
"${SRC_DIR}/modules/_testcapi/sys.c"
292+
"${SRC_DIR}/modules/_testcapi/testcapi_long.h"
293+
"${SRC_DIR}/modules/_testcapi/tuple.c"
294+
"${SRC_DIR}/modules/_testcapi/unicode.c"
295+
"${SRC_DIR}/modules/_testcapi/util.h"
296+
# "${SRC_DIR}/modules/_testcapi/vectorcall.c"
297+
# "${SRC_DIR}/modules/_testcapi/vectorcall_limited.c"
298+
# "${SRC_DIR}/modules/_testcapi/watchers.c"
299+
"${SRC_DIR}/modules/_testcapi.c"
300+
)
239301

240302
if(NOT WIN32)
241-
native_module("_testcapi" FALSE "${SRC_DIR}/modules/_testcapi.c")
303+
native_module("_testcapi" FALSE "${TESTCAPI_SRC}")
242304
simple_native_module("_testbuffer")
243305
simple_native_module("_testmultiphase")
306+
simple_native_module("_testsinglephase")
244307
simple_native_module("_ctypes_test")
245308

246309
###################### BZIP2 ########################

‎graalpython/com.oracle.graal.python.cext/expat/expat_config.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2019, 2023, Oracle and/or its affiliates.
1+
/* Copyright (c) 2019, 2024, Oracle and/or its affiliates.
22
* Copyright (C) 1996-2020 Python Software Foundation
33
*
44
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -21,6 +21,7 @@
2121

2222
#define XML_NS 1
2323
#define XML_DTD 1
24+
#define XML_GE 1
2425
#define XML_CONTEXT_BYTES 1024
2526

2627
// bpo-30947: Python uses best available entropy sources to

‎graalpython/com.oracle.graal.python.cext/expat/pyexpatns.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2019, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2019, 2024, Oracle and/or its affiliates.
22
* Copyright (C) 1996-2020 Python Software Foundation
33
*
44
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -113,6 +113,7 @@
113113
#define XML_SetNotStandaloneHandler PyExpat_XML_SetNotStandaloneHandler
114114
#define XML_SetParamEntityParsing PyExpat_XML_SetParamEntityParsing
115115
#define XML_SetProcessingInstructionHandler PyExpat_XML_SetProcessingInstructionHandler
116+
#define XML_SetReparseDeferralEnabled PyExpat_XML_SetReparseDeferralEnabled
116117
#define XML_SetReturnNSTriplet PyExpat_XML_SetReturnNSTriplet
117118
#define XML_SetSkippedEntityHandler PyExpat_XML_SetSkippedEntityHandler
118119
#define XML_SetStartCdataSectionHandler PyExpat_XML_SetStartCdataSectionHandler

‎graalpython/com.oracle.graal.python.cext/include/Python.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ struct timeval;
5959
#include "bytearrayobject.h"
6060
#include "bytesobject.h"
6161
#include "unicodeobject.h"
62+
#include "cpython/initconfig.h"
63+
#include "pystate.h"
64+
#include "pyerrors.h"
6265
#include "longobject.h"
6366
#include "cpython/longintrepr.h"
6467
#include "boolobject.h"
@@ -82,8 +85,6 @@ struct timeval;
8285
#include "sliceobject.h"
8386
#include "cpython/cellobject.h"
8487
#include "iterobject.h"
85-
#include "cpython/initconfig.h"
86-
#include "pystate.h"
8788
#include "cpython/genobject.h"
8889
#include "descrobject.h"
8990
#include "genericaliasobject.h"
@@ -92,7 +93,6 @@ struct timeval;
9293
#include "structseq.h"
9394
#include "cpython/pytime.h"
9495
#include "codecs.h"
95-
#include "pyerrors.h"
9696
#include "pythread.h"
9797
#include "cpython/context.h"
9898
#include "modsupport.h"

0 commit comments

Comments
 (0)