bpo-41078: Rename pycore_tupleobject.h to pycore_tuple.h (GH-21056)

This commit is contained in:
Victor Stinner 2020-06-22 17:27:35 +02:00 committed by GitHub
parent 9e27bc0c1e
commit 384621c42f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 51 additions and 52 deletions

View File

@ -1,5 +1,5 @@
#ifndef Py_INTERNAL_TUPLEOBJECT_H #ifndef Py_INTERNAL_TUPLE_H
#define Py_INTERNAL_TUPLEOBJECT_H #define Py_INTERNAL_TUPLE_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -11,9 +11,10 @@ extern "C" {
#include "tupleobject.h" /* _PyTuple_CAST() */ #include "tupleobject.h" /* _PyTuple_CAST() */
#define _PyTuple_ITEMS(op) (_PyTuple_CAST(op)->ob_item) #define _PyTuple_ITEMS(op) (_PyTuple_CAST(op)->ob_item)
PyAPI_FUNC(PyObject *) _PyTuple_FromArray(PyObject *const *, Py_ssize_t); PyAPI_FUNC(PyObject *) _PyTuple_FromArray(PyObject *const *, Py_ssize_t);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* !Py_INTERNAL_TUPLEOBJECT_H */ #endif /* !Py_INTERNAL_TUPLE_H */

View File

@ -1120,7 +1120,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/internal/pycore_runtime.h \ $(srcdir)/Include/internal/pycore_runtime.h \
$(srcdir)/Include/internal/pycore_sysmodule.h \ $(srcdir)/Include/internal/pycore_sysmodule.h \
$(srcdir)/Include/internal/pycore_traceback.h \ $(srcdir)/Include/internal/pycore_traceback.h \
$(srcdir)/Include/internal/pycore_tupleobject.h \ $(srcdir)/Include/internal/pycore_tuple.h \
$(srcdir)/Include/internal/pycore_warnings.h \ $(srcdir)/Include/internal/pycore_warnings.h \
$(DTRACE_HEADERS) $(DTRACE_HEADERS)

View File

@ -1,6 +1,6 @@
#include "Python.h" #include "Python.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "structmember.h" // PyMemberDef #include "structmember.h" // PyMemberDef
/* _functools module written and maintained /* _functools module written and maintained

View File

@ -1,7 +1,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_ITEMS()
#include <stddef.h> // offsetof() #include <stddef.h> // offsetof()
/* Itertools module written and maintained /* Itertools module written and maintained

View File

@ -1,11 +1,11 @@
#include "Python.h" #include "Python.h"
#include "pycore_call.h" #include "pycore_call.h" // _PyObject_CallNoArgTstate()
#include "pycore_ceval.h" // _PyEval_EvalFrame() #include "pycore_ceval.h" // _PyEval_EvalFrame()
#include "pycore_object.h" #include "pycore_object.h" // _PyObject_GC_TRACK()
#include "pycore_pyerrors.h" #include "pycore_pyerrors.h" // _PyErr_Occurred()
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "frameobject.h" #include "frameobject.h" // _PyFrame_New_NoTrack()
static PyObject *const * static PyObject *const *

View File

@ -4,10 +4,10 @@
#include "code.h" #include "code.h"
#include "opcode.h" #include "opcode.h"
#include "structmember.h" // PyMemberDef #include "structmember.h" // PyMemberDef
#include "pycore_code.h" #include "pycore_code.h" // _PyOpcache
#include "pycore_interp.h" // PyInterpreterState.co_extra_freefuncs #include "pycore_interp.h" // PyInterpreterState.co_extra_freefuncs
#include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "clinic/codeobject.c.h" #include "clinic/codeobject.c.h"
/* Holder for co_extra information */ /* Holder for co_extra information */

View File

@ -1,10 +1,10 @@
/* Descriptors -- a new, flexible way to describe attributes */ /* Descriptors -- a new, flexible way to describe attributes */
#include "Python.h" #include "Python.h"
#include "pycore_ceval.h" // _Py_EnterRecursiveCall() #include "pycore_ceval.h" // _Py_EnterRecursiveCall()
#include "pycore_object.h" #include "pycore_object.h" // _PyObject_GC_UNTRACK()
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "structmember.h" // PyMemberDef #include "structmember.h" // PyMemberDef
_Py_IDENTIFIER(getattr); _Py_IDENTIFIER(getattr);

View File

@ -3,7 +3,6 @@
#include "Python.h" #include "Python.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_tupleobject.h"
#include "code.h" #include "code.h"
#include "structmember.h" // PyMemberDef #include "structmember.h" // PyMemberDef

View File

@ -1,10 +1,10 @@
/* List object implementation */ /* List object implementation */
#include "Python.h" #include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check() #include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_object.h" #include "pycore_interp.h" // PyInterpreterState.list
#include "pycore_tupleobject.h" #include "pycore_object.h" // _PyObject_GC_TRACK()
#include "pycore_accu.h" #include "pycore_tuple.h" // _PyTuple_FromArray()
#ifdef STDC_HEADERS #ifdef STDC_HEADERS
#include <stddef.h> #include <stddef.h>

View File

@ -1,8 +1,8 @@
/* Range object implementation */ /* Range object implementation */
#include "Python.h" #include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check() #include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "structmember.h" // PyMemberDef #include "structmember.h" // PyMemberDef
/* Support objects whose length is > PY_SSIZE_T_MAX. /* Support objects whose length is > PY_SSIZE_T_MAX.

View File

@ -8,8 +8,8 @@
*/ */
#include "Python.h" #include "Python.h"
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_FromArray()
#include "pycore_object.h" #include "pycore_object.h" // _PyObject_GC_TRACK()
#include "structmember.h" // PyMemberDef #include "structmember.h" // PyMemberDef
static const char visible_length_key[] = "n_sequence_fields"; static const char visible_length_key[] = "n_sequence_fields";

View File

@ -191,7 +191,7 @@
<ClInclude Include="..\Include\internal\pycore_runtime.h" /> <ClInclude Include="..\Include\internal\pycore_runtime.h" />
<ClInclude Include="..\Include\internal\pycore_sysmodule.h" /> <ClInclude Include="..\Include\internal\pycore_sysmodule.h" />
<ClInclude Include="..\Include\internal\pycore_traceback.h" /> <ClInclude Include="..\Include\internal\pycore_traceback.h" />
<ClInclude Include="..\Include\internal\pycore_tupleobject.h" /> <ClInclude Include="..\Include\internal\pycore_tuple.h" />
<ClInclude Include="..\Include\internal\pycore_warnings.h" /> <ClInclude Include="..\Include\internal\pycore_warnings.h" />
<ClInclude Include="..\Include\interpreteridobject.h" /> <ClInclude Include="..\Include\interpreteridobject.h" />
<ClInclude Include="..\Include\intrcheck.h" /> <ClInclude Include="..\Include\intrcheck.h" />

View File

@ -273,7 +273,7 @@
<ClInclude Include="..\Include\internal\pycore_traceback.h"> <ClInclude Include="..\Include\internal\pycore_traceback.h">
<Filter>Include</Filter> <Filter>Include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Include\internal\pycore_tupleobject.h"> <ClInclude Include="..\Include\internal\pycore_tuple.h">
<Filter>Include</Filter> <Filter>Include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Include\internal\pycore_warnings.h"> <ClInclude Include="..\Include\internal\pycore_warnings.h">

View File

@ -4,10 +4,9 @@
#include <ctype.h> #include <ctype.h>
#include "ast.h" #include "ast.h"
#undef Yield /* undefine macro conflicting with <winbase.h> */ #undef Yield /* undefine macro conflicting with <winbase.h> */
#include "pycore_object.h" #include "pycore_pyerrors.h" // _PyErr_NoMemory()
#include "pycore_pyerrors.h" #include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_tuple.h" // _PyTuple_FromArray()
#include "pycore_tupleobject.h"
_Py_IDENTIFIER(__builtins__); _Py_IDENTIFIER(__builtins__);
_Py_IDENTIFIER(__dict__); _Py_IDENTIFIER(__dict__);

View File

@ -11,17 +11,17 @@
#include "Python.h" #include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check() #include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_call.h" #include "pycore_call.h" // _PyObject_FastCallDictTstate()
#include "pycore_ceval.h" #include "pycore_ceval.h" // _PyEval_SignalAsyncExc()
#include "pycore_code.h" #include "pycore_code.h" // _PyCode_InitOpcache()
#include "pycore_initconfig.h" #include "pycore_initconfig.h" // _PyStatus_OK()
#include "pycore_object.h" #include "pycore_object.h" // _PyObject_GC_TRACK()
#include "pycore_pyerrors.h" #include "pycore_pyerrors.h" // _PyErr_Fetch()
#include "pycore_pylifecycle.h" #include "pycore_pylifecycle.h" // _PyErr_Print()
#include "pycore_pymem.h" // _PyMem_IsPtrFreed() #include "pycore_pymem.h" // _PyMem_IsPtrFreed()
#include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "pycore_sysmodule.h" #include "pycore_sysmodule.h" // _PySys_Audit()
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "code.h" #include "code.h"
#include "dictobject.h" #include "dictobject.h"

View File

@ -2,7 +2,7 @@
/* New getargs implementation */ /* New getargs implementation */
#include "Python.h" #include "Python.h"
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_ITEMS()
#include <ctype.h> #include <ctype.h>
#include <float.h> #include <float.h>

View File

@ -15,18 +15,18 @@ Data members:
*/ */
#include "Python.h" #include "Python.h"
#include "code.h"
#include "frameobject.h" // PyFrame_GetBack()
#include "pycore_ceval.h" // _Py_RecursionLimitLowerWaterMark() #include "pycore_ceval.h" // _Py_RecursionLimitLowerWaterMark()
#include "pycore_initconfig.h" #include "pycore_initconfig.h" // _PyStatus_EXCEPTION()
#include "pycore_object.h" #include "pycore_object.h" // _PyObject_IS_GC()
#include "pycore_pathconfig.h" #include "pycore_pathconfig.h" // _PyPathConfig_ComputeSysPath0()
#include "pycore_pyerrors.h" #include "pycore_pyerrors.h" // _PyErr_Fetch()
#include "pycore_pylifecycle.h" #include "pycore_pylifecycle.h" // _PyErr_WriteUnraisableDefaultHook()
#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator() #include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_tupleobject.h" #include "pycore_tuple.h" // _PyTuple_FromArray()
#include "code.h"
#include "frameobject.h" // PyFrame_GetBack()
#include "pydtrace.h" #include "pydtrace.h"
#include "osdefs.h" // DELIM #include "osdefs.h" // DELIM
#include <locale.h> #include <locale.h>