Skip to content

Commit 384621c

Browse files
vstinnervstinner
authored
bpo-41078: Rename pycore_tupleobject.h to pycore_tuple.h (GH-21056)
1 parent 9e27bc0 commit 384621c

17 files changed

+51
-52
lines changed

‎Include/internal/pycore_tupleobject.h renamed to ‎Include/internal/pycore_tuple.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef Py_INTERNAL_TUPLEOBJECT_H
2-
#define Py_INTERNAL_TUPLEOBJECT_H
1+
#ifndef Py_INTERNAL_TUPLE_H
2+
#define Py_INTERNAL_TUPLE_H
33
#ifdef __cplusplus
44
extern "C" {
55
#endif
@@ -11,9 +11,10 @@ extern "C" {
1111
#include "tupleobject.h" /* _PyTuple_CAST() */
1212

1313
#define _PyTuple_ITEMS(op) (_PyTuple_CAST(op)->ob_item)
14+
1415
PyAPI_FUNC(PyObject *) _PyTuple_FromArray(PyObject *const *, Py_ssize_t);
1516

1617
#ifdef __cplusplus
1718
}
1819
#endif
19-
#endif /* !Py_INTERNAL_TUPLEOBJECT_H */
20+
#endif /* !Py_INTERNAL_TUPLE_H */

‎Makefile.pre.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ PYTHON_HEADERS= \
11201120
$(srcdir)/Include/internal/pycore_runtime.h \
11211121
$(srcdir)/Include/internal/pycore_sysmodule.h \
11221122
$(srcdir)/Include/internal/pycore_traceback.h \
1123-
$(srcdir)/Include/internal/pycore_tupleobject.h \
1123+
$(srcdir)/Include/internal/pycore_tuple.h \
11241124
$(srcdir)/Include/internal/pycore_warnings.h \
11251125
$(DTRACE_HEADERS)
11261126

‎Modules/_functoolsmodule.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "Python.h"
22
#include "pycore_pystate.h" // _PyThreadState_GET()
3-
#include "pycore_tupleobject.h"
3+
#include "pycore_tuple.h" // _PyTuple_ITEMS()
44
#include "structmember.h" // PyMemberDef
55

66
/* _functools module written and maintained

‎Modules/itertoolsmodule.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#define PY_SSIZE_T_CLEAN
33
#include "Python.h"
4-
#include "pycore_tupleobject.h"
4+
#include "pycore_tuple.h" // _PyTuple_ITEMS()
55
#include <stddef.h> // offsetof()
66

77
/* Itertools module written and maintained

‎Objects/call.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "Python.h"
2-
#include "pycore_call.h"
3-
#include "pycore_ceval.h" // _PyEval_EvalFrame()
4-
#include "pycore_object.h"
5-
#include "pycore_pyerrors.h"
6-
#include "pycore_pystate.h" // _PyThreadState_GET()
7-
#include "pycore_tupleobject.h"
8-
#include "frameobject.h"
2+
#include "pycore_call.h" // _PyObject_CallNoArgTstate()
3+
#include "pycore_ceval.h" // _PyEval_EvalFrame()
4+
#include "pycore_object.h" // _PyObject_GC_TRACK()
5+
#include "pycore_pyerrors.h" // _PyErr_Occurred()
6+
#include "pycore_pystate.h" // _PyThreadState_GET()
7+
#include "pycore_tuple.h" // _PyTuple_ITEMS()
8+
#include "frameobject.h" // _PyFrame_New_NoTrack()
99

1010

1111
static PyObject *const *

‎Objects/codeobject.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include "code.h"
55
#include "opcode.h"
66
#include "structmember.h" // PyMemberDef
7-
#include "pycore_code.h"
7+
#include "pycore_code.h" // _PyOpcache
88
#include "pycore_interp.h" // PyInterpreterState.co_extra_freefuncs
99
#include "pycore_pystate.h" // _PyInterpreterState_GET()
10-
#include "pycore_tupleobject.h"
10+
#include "pycore_tuple.h" // _PyTuple_ITEMS()
1111
#include "clinic/codeobject.c.h"
1212

1313
/* Holder for co_extra information */

‎Objects/descrobject.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Descriptors -- a new, flexible way to describe attributes */
22

33
#include "Python.h"
4-
#include "pycore_ceval.h" // _Py_EnterRecursiveCall()
5-
#include "pycore_object.h"
6-
#include "pycore_pystate.h" // _PyThreadState_GET()
7-
#include "pycore_tupleobject.h"
4+
#include "pycore_ceval.h" // _Py_EnterRecursiveCall()
5+
#include "pycore_object.h" // _PyObject_GC_UNTRACK()
6+
#include "pycore_pystate.h" // _PyThreadState_GET()
7+
#include "pycore_tuple.h" // _PyTuple_ITEMS()
88
#include "structmember.h" // PyMemberDef
99

1010
_Py_IDENTIFIER(getattr);

‎Objects/funcobject.c

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "Python.h"
55
#include "pycore_object.h"
6-
#include "pycore_tupleobject.h"
76
#include "code.h"
87
#include "structmember.h" // PyMemberDef
98

‎Objects/listobject.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* List object implementation */
22

33
#include "Python.h"
4-
#include "pycore_abstract.h" // _PyIndex_Check()
5-
#include "pycore_object.h"
6-
#include "pycore_tupleobject.h"
7-
#include "pycore_accu.h"
4+
#include "pycore_abstract.h" // _PyIndex_Check()
5+
#include "pycore_interp.h" // PyInterpreterState.list
6+
#include "pycore_object.h" // _PyObject_GC_TRACK()
7+
#include "pycore_tuple.h" // _PyTuple_FromArray()
88

99
#ifdef STDC_HEADERS
1010
#include <stddef.h>

‎Objects/rangeobject.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* Range object implementation */
22

33
#include "Python.h"
4-
#include "pycore_abstract.h" // _PyIndex_Check()
5-
#include "pycore_tupleobject.h"
4+
#include "pycore_abstract.h" // _PyIndex_Check()
5+
#include "pycore_tuple.h" // _PyTuple_ITEMS()
66
#include "structmember.h" // PyMemberDef
77

88
/* Support objects whose length is > PY_SSIZE_T_MAX.

‎Objects/structseq.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*/
99

1010
#include "Python.h"
11-
#include "pycore_tupleobject.h"
12-
#include "pycore_object.h"
11+
#include "pycore_tuple.h" // _PyTuple_FromArray()
12+
#include "pycore_object.h" // _PyObject_GC_TRACK()
1313
#include "structmember.h" // PyMemberDef
1414

1515
static const char visible_length_key[] = "n_sequence_fields";

‎PCbuild/pythoncore.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<ClInclude Include="..\Include\internal\pycore_runtime.h" />
192192
<ClInclude Include="..\Include\internal\pycore_sysmodule.h" />
193193
<ClInclude Include="..\Include\internal\pycore_traceback.h" />
194-
<ClInclude Include="..\Include\internal\pycore_tupleobject.h" />
194+
<ClInclude Include="..\Include\internal\pycore_tuple.h" />
195195
<ClInclude Include="..\Include\internal\pycore_warnings.h" />
196196
<ClInclude Include="..\Include\interpreteridobject.h" />
197197
<ClInclude Include="..\Include\intrcheck.h" />

‎PCbuild/pythoncore.vcxproj.filters

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
<ClInclude Include="..\Include\internal\pycore_traceback.h">
274274
<Filter>Include</Filter>
275275
</ClInclude>
276-
<ClInclude Include="..\Include\internal\pycore_tupleobject.h">
276+
<ClInclude Include="..\Include\internal\pycore_tuple.h">
277277
<Filter>Include</Filter>
278278
</ClInclude>
279279
<ClInclude Include="..\Include\internal\pycore_warnings.h">

‎Python/bltinmodule.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
#include <ctype.h>
55
#include "ast.h"
66
#undef Yield /* undefine macro conflicting with <winbase.h> */
7-
#include "pycore_object.h"
8-
#include "pycore_pyerrors.h"
9-
#include "pycore_pystate.h" // _PyThreadState_GET()
10-
#include "pycore_tupleobject.h"
7+
#include "pycore_pyerrors.h" // _PyErr_NoMemory()
8+
#include "pycore_pystate.h" // _PyThreadState_GET()
9+
#include "pycore_tuple.h" // _PyTuple_FromArray()
1110

1211
_Py_IDENTIFIER(__builtins__);
1312
_Py_IDENTIFIER(__dict__);

‎Python/ceval.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111

1212
#include "Python.h"
1313
#include "pycore_abstract.h" // _PyIndex_Check()
14-
#include "pycore_call.h"
15-
#include "pycore_ceval.h"
16-
#include "pycore_code.h"
17-
#include "pycore_initconfig.h"
18-
#include "pycore_object.h"
19-
#include "pycore_pyerrors.h"
20-
#include "pycore_pylifecycle.h"
14+
#include "pycore_call.h" // _PyObject_FastCallDictTstate()
15+
#include "pycore_ceval.h" // _PyEval_SignalAsyncExc()
16+
#include "pycore_code.h" // _PyCode_InitOpcache()
17+
#include "pycore_initconfig.h" // _PyStatus_OK()
18+
#include "pycore_object.h" // _PyObject_GC_TRACK()
19+
#include "pycore_pyerrors.h" // _PyErr_Fetch()
20+
#include "pycore_pylifecycle.h" // _PyErr_Print()
2121
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()
2222
#include "pycore_pystate.h" // _PyInterpreterState_GET()
23-
#include "pycore_sysmodule.h"
24-
#include "pycore_tupleobject.h"
23+
#include "pycore_sysmodule.h" // _PySys_Audit()
24+
#include "pycore_tuple.h" // _PyTuple_ITEMS()
2525

2626
#include "code.h"
2727
#include "dictobject.h"

‎Python/getargs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* New getargs implementation */
33

44
#include "Python.h"
5-
#include "pycore_tupleobject.h"
5+
#include "pycore_tuple.h" // _PyTuple_ITEMS()
66

77
#include <ctype.h>
88
#include <float.h>

‎Python/sysmodule.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ Data members:
1515
*/
1616

1717
#include "Python.h"
18-
#include "code.h"
19-
#include "frameobject.h" // PyFrame_GetBack()
2018
#include "pycore_ceval.h" // _Py_RecursionLimitLowerWaterMark()
21-
#include "pycore_initconfig.h"
22-
#include "pycore_object.h"
23-
#include "pycore_pathconfig.h"
24-
#include "pycore_pyerrors.h"
25-
#include "pycore_pylifecycle.h"
19+
#include "pycore_initconfig.h" // _PyStatus_EXCEPTION()
20+
#include "pycore_object.h" // _PyObject_IS_GC()
21+
#include "pycore_pathconfig.h" // _PyPathConfig_ComputeSysPath0()
22+
#include "pycore_pyerrors.h" // _PyErr_Fetch()
23+
#include "pycore_pylifecycle.h" // _PyErr_WriteUnraisableDefaultHook()
2624
#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
2725
#include "pycore_pystate.h" // _PyThreadState_GET()
28-
#include "pycore_tupleobject.h"
26+
#include "pycore_tuple.h" // _PyTuple_FromArray()
2927

28+
#include "code.h"
29+
#include "frameobject.h" // PyFrame_GetBack()
3030
#include "pydtrace.h"
3131
#include "osdefs.h" // DELIM
3232
#include <locale.h>

0 commit comments

Comments
 (0)