From 621cebe81b1e6c8de10425955bf532d31ee4df42 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 12 Nov 2018 16:53:38 +0100 Subject: [PATCH] bpo-35081: Rename internal headers (GH-10275) Rename Include/internal/ headers: * pycore_hash.h -> pycore_pyhash.h * pycore_lifecycle.h -> pycore_pylifecycle.h * pycore_mem.h -> pycore_pymem.h * pycore_state.h -> pycore_pystate.h Add missing headers to Makefile.pre.in and PCbuild: * pycore_condvar.h. * pycore_hamt.h * pycore_pyhash.h --- .../internal/{pycore_hash.h => pycore_pyhash.h} | 0 ...{pycore_lifecycle.h => pycore_pylifecycle.h} | 0 .../internal/{pycore_mem.h => pycore_pymem.h} | 0 .../{pycore_state.h => pycore_pystate.h} | 2 +- Include/pystate.h | 2 +- Makefile.pre.in | 9 ++++++--- Modules/_functoolsmodule.c | 4 ++-- Modules/_io/bufferedio.c | 2 +- Modules/_threadmodule.c | 2 +- Modules/_xxsubinterpretersmodule.c | 2 +- Modules/gcmodule.c | 4 ++-- Modules/getpath.c | 2 +- Modules/main.c | 6 +++--- Modules/posixmodule.c | 2 +- Objects/abstract.c | 2 +- Objects/bytearrayobject.c | 4 ++-- Objects/bytesobject.c | 4 ++-- Objects/call.c | 2 +- Objects/cellobject.c | 4 ++-- Objects/classobject.c | 4 ++-- Objects/codeobject.c | 2 +- Objects/descrobject.c | 2 +- Objects/dictobject.c | 2 +- Objects/exceptions.c | 4 ++-- Objects/frameobject.c | 2 +- Objects/funcobject.c | 4 ++-- Objects/genobject.c | 2 +- Objects/iterobject.c | 4 ++-- Objects/listobject.c | 2 +- Objects/memoryobject.c | 4 ++-- Objects/methodobject.c | 4 ++-- Objects/moduleobject.c | 2 +- Objects/object.c | 2 +- Objects/obmalloc.c | 2 +- Objects/odictobject.c | 2 +- Objects/setobject.c | 2 +- Objects/sliceobject.c | 4 ++-- Objects/tupleobject.c | 2 +- Objects/typeobject.c | 2 +- Objects/unicodeobject.c | 2 +- PC/getpathp.c | 2 +- PCbuild/pythoncore.vcxproj | 7 ++++--- PCbuild/pythoncore.vcxproj.filters | 17 ++++++++++------- Parser/myreadline.c | 2 +- Parser/pgenmain.c | 4 ++-- Programs/python.c | 2 +- Python/_warnings.c | 2 +- Python/bltinmodule.c | 2 +- Python/ceval.c | 2 +- Python/codecs.c | 2 +- Python/context.c | 2 +- Python/coreconfig.c | 6 +++--- Python/dynload_shlib.c | 2 +- Python/errors.c | 2 +- Python/frozenmain.c | 2 +- Python/hamt.c | 2 +- Python/import.c | 8 ++++---- Python/pathconfig.c | 4 ++-- Python/pylifecycle.c | 6 +++--- Python/pystate.c | 4 ++-- Python/pythonrun.c | 2 +- Python/symtable.c | 2 +- Python/sysmodule.c | 6 +++--- Python/thread.c | 2 +- Python/traceback.c | 2 +- 65 files changed, 105 insertions(+), 98 deletions(-) rename Include/internal/{pycore_hash.h => pycore_pyhash.h} (100%) rename Include/internal/{pycore_lifecycle.h => pycore_pylifecycle.h} (100%) rename Include/internal/{pycore_mem.h => pycore_pymem.h} (100%) rename Include/internal/{pycore_state.h => pycore_pystate.h} (99%) diff --git a/Include/internal/pycore_hash.h b/Include/internal/pycore_pyhash.h similarity index 100% rename from Include/internal/pycore_hash.h rename to Include/internal/pycore_pyhash.h diff --git a/Include/internal/pycore_lifecycle.h b/Include/internal/pycore_pylifecycle.h similarity index 100% rename from Include/internal/pycore_lifecycle.h rename to Include/internal/pycore_pylifecycle.h diff --git a/Include/internal/pycore_mem.h b/Include/internal/pycore_pymem.h similarity index 100% rename from Include/internal/pycore_mem.h rename to Include/internal/pycore_pymem.h diff --git a/Include/internal/pycore_state.h b/Include/internal/pycore_pystate.h similarity index 99% rename from Include/internal/pycore_state.h rename to Include/internal/pycore_pystate.h index 01f214045c5..4f5545aaa45 100644 --- a/Include/internal/pycore_state.h +++ b/Include/internal/pycore_pystate.h @@ -12,8 +12,8 @@ extern "C" { #include "pythread.h" #include "pycore_ceval.h" -#include "pycore_mem.h" #include "pycore_pathconfig.h" +#include "pycore_pymem.h" #include "pycore_warnings.h" diff --git a/Include/pystate.h b/Include/pystate.h index b30c3187b67..58499ea35b4 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -301,7 +301,7 @@ PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); /* Get the current Python thread state. Macro using PyThreadState_Get() or _PyThreadState_GET() depending if - pycore_state.h is included or not (this header redefines the macro). + pycore_pystate.h is included or not (this header redefines the macro). If PyThreadState_Get() is used, issue a fatal error if the current thread state is NULL. diff --git a/Makefile.pre.in b/Makefile.pre.in index 15f3687be5b..87a84eb6808 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1027,13 +1027,16 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/pycore_accu.h \ $(srcdir)/Include/internal/pycore_atomic.h \ $(srcdir)/Include/internal/pycore_ceval.h \ + $(srcdir)/Include/internal/pycore_condvar.h \ $(srcdir)/Include/internal/pycore_context.h \ $(srcdir)/Include/internal/pycore_getopt.h \ $(srcdir)/Include/internal/pycore_gil.h \ - $(srcdir)/Include/internal/pycore_lifecycle.h \ - $(srcdir)/Include/internal/pycore_mem.h \ + $(srcdir)/Include/internal/pycore_hamt.h \ $(srcdir)/Include/internal/pycore_pathconfig.h \ - $(srcdir)/Include/internal/pycore_state.h \ + $(srcdir)/Include/internal/pycore_pyhash.h \ + $(srcdir)/Include/internal/pycore_pylifecycle.h \ + $(srcdir)/Include/internal/pycore_pymem.h \ + $(srcdir)/Include/internal/pycore_pystate.h \ $(srcdir)/Include/internal/pycore_warnings.h \ $(DTRACE_HEADERS) diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index 692c3b3563a..773102bb590 100644 --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -1,7 +1,7 @@ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "structmember.h" /* _functools module written and maintained diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 24ae963b2b8..e1e45dc8fae 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -9,7 +9,7 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "structmember.h" #include "pythread.h" #include "_iomodule.h" diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index ad65188d7a4..72d044c08a1 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -3,7 +3,7 @@ /* Interface to Sjoerd's portable C thread library */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "structmember.h" /* offsetof */ #include "pythread.h" diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c index fb0b83add5f..33509ef4ded 100644 --- a/Modules/_xxsubinterpretersmodule.c +++ b/Modules/_xxsubinterpretersmodule.c @@ -4,7 +4,7 @@ #include "Python.h" #include "frameobject.h" -#include "pycore_state.h" +#include "pycore_pystate.h" static char * diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index a54be07b27a..48b470006c4 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -25,8 +25,8 @@ #include "Python.h" #include "pycore_context.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "frameobject.h" /* for PyFrame_ClearFreeList */ #include "pydtrace.h" #include "pytime.h" /* for _PyTime_GetMonotonicClock() */ diff --git a/Modules/getpath.c b/Modules/getpath.c index 6b443f62b05..18df795c93f 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -4,7 +4,7 @@ #include "osdefs.h" #include "pycore_fileutils.h" #include "pycore_pathconfig.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include #include diff --git a/Modules/main.c b/Modules/main.c index c847d1acedb..281707ae5b2 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -3,10 +3,10 @@ #include "Python.h" #include "osdefs.h" #include "pycore_getopt.h" -#include "pycore_lifecycle.h" -#include "pycore_mem.h" #include "pycore_pathconfig.h" -#include "pycore_state.h" +#include "pycore_pylifecycle.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index bf886e31d76..bf3e03e6808 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -32,7 +32,7 @@ #else #include "winreparse.h" #endif -#include "pycore_state.h" +#include "pycore_pystate.h" /* On android API level 21, 'AT_EACCESS' is not declared although * HAVE_FACCESSAT is defined. */ diff --git a/Objects/abstract.c b/Objects/abstract.c index be4758d9451..567da2d6b50 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1,7 +1,7 @@ /* Abstract Object Interface (many thanks to Jim Fulton) */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include #include "structmember.h" /* we need the offsetof() macro from there */ #include "longintrepr.h" diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 7a0c340c804..561b06cdf96 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2,8 +2,8 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "structmember.h" #include "bytes_methods.h" #include "bytesobject.h" diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index c912fc04fd4..fac12f55210 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -3,8 +3,8 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "bytes_methods.h" #include "pystrhex.h" diff --git a/Objects/call.c b/Objects/call.c index 707b49a67ee..7c452b99d11 100644 --- a/Objects/call.c +++ b/Objects/call.c @@ -1,5 +1,5 @@ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "frameobject.h" diff --git a/Objects/cellobject.c b/Objects/cellobject.c index 0b390c78f04..7605bcf7bc9 100644 --- a/Objects/cellobject.c +++ b/Objects/cellobject.c @@ -1,8 +1,8 @@ /* Cell object implementation */ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" PyObject * PyCell_New(PyObject *obj) diff --git a/Objects/classobject.c b/Objects/classobject.c index 93d1c67f1b4..79b0562f7d5 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -1,8 +1,8 @@ /* Class object implementation (dead now except for methods) */ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "structmember.h" #define TP_DESCR_GET(t) ((t)->tp_descr_get) diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 24502135042..a2efa7ed03f 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -3,7 +3,7 @@ #include "Python.h" #include "code.h" #include "structmember.h" -#include "pycore_state.h" +#include "pycore_pystate.h" /* Holder for co_extra information */ typedef struct { diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 17d0f5a005a..ca814bf78a6 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -1,7 +1,7 @@ /* Descriptors -- a new, flexible way to describe attributes */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "structmember.h" /* Why is this not included in Python.h? */ /*[clinic input] diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 08ec9e254ab..ca383a193d3 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -111,7 +111,7 @@ converting the dict to the combined table. #define PyDict_MINSIZE 8 #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "dict-common.h" #include "stringlib/eq.h" /* to get unicode_eq() */ diff --git a/Objects/exceptions.c b/Objects/exceptions.c index da79260ab3b..5ab127111ca 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -6,8 +6,8 @@ #define PY_SSIZE_T_CLEAN #include -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "structmember.h" #include "osdefs.h" diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 7704022dd2e..70cf5807130 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -1,7 +1,7 @@ /* Frame object implementation */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "code.h" #include "frameobject.h" diff --git a/Objects/funcobject.c b/Objects/funcobject.c index 86488217ec8..a8e11a9a2d3 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -2,8 +2,8 @@ /* Function object implementation */ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "code.h" #include "structmember.h" diff --git a/Objects/genobject.c b/Objects/genobject.c index 7c2948bb52d..98c939446e8 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -1,7 +1,7 @@ /* Generator object implementation */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "frameobject.h" #include "structmember.h" #include "opcode.h" diff --git a/Objects/iterobject.c b/Objects/iterobject.c index 23f0639db2f..64bf92382be 100644 --- a/Objects/iterobject.c +++ b/Objects/iterobject.c @@ -1,8 +1,8 @@ /* Iterator objects */ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" typedef struct { PyObject_HEAD diff --git a/Objects/listobject.c b/Objects/listobject.c index ffd91a63e32..44160abae6e 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -1,7 +1,7 @@ /* List object implementation */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "pycore_accu.h" #ifdef STDC_HEADERS diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index f234bb4117d..060ae4dd3cd 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -1,8 +1,8 @@ /* Memoryview object implementation */ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "pystrhex.h" #include diff --git a/Objects/methodobject.c b/Objects/methodobject.c index b0bbfa2f5f9..cfea8cf410d 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -2,8 +2,8 @@ /* Method object implementation */ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "structmember.h" /* Free list for method objects to safe malloc/free overhead diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 7fb711a1cb0..fca8521f5f0 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -2,7 +2,7 @@ /* Module object implementation */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "structmember.h" static Py_ssize_t max_module_number; diff --git a/Objects/object.c b/Objects/object.c index 72e2684820c..801b205c9b6 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -2,7 +2,7 @@ /* Generic object operations; and implementation of None */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "pycore_context.h" #include "frameobject.h" diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index 2cf024c352b..1c2a32050f9 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -1,5 +1,5 @@ #include "Python.h" -#include "pycore_mem.h" +#include "pycore_pymem.h" #include diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 52ac7e5f88b..13bc972039f 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -465,7 +465,7 @@ later: */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "structmember.h" #include "dict-common.h" #include diff --git a/Objects/setobject.c b/Objects/setobject.c index 035b1db06d8..b11cb3a5869 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -32,7 +32,7 @@ */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "structmember.h" /* Object used as dummy key to fill deleted entries */ diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c index 9f1cf78cedd..1f79faa3e6c 100644 --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -14,8 +14,8 @@ this type and there is exactly one in existence. */ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "structmember.h" static PyObject * diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index c997bc6fa2d..e7ba09d71d3 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -2,7 +2,7 @@ /* Tuple object implementation */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "pycore_accu.h" /*[clinic input] diff --git a/Objects/typeobject.c b/Objects/typeobject.c index dedc4f7c876..682d44696e5 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1,7 +1,7 @@ /* Type object implementation */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "frameobject.h" #include "structmember.h" diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 5338781edc2..e5d026f9aa0 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -41,7 +41,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define PY_SSIZE_T_CLEAN #include "Python.h" #include "pycore_fileutils.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "ucnhash.h" #include "bytes_methods.h" #include "stringlib/eq.h" diff --git a/PC/getpathp.c b/PC/getpathp.c index 3a62738d233..ee9d3d258f6 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -80,7 +80,7 @@ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "osdefs.h" #include diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 460500cc2b1..0ae24fade13 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -119,10 +119,11 @@ - - - + + + + diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 64fb77b867c..ef5ef7268a3 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -156,16 +156,19 @@ Include - - Include - - - Include - Include - + + Include + + + Include + + + Include + + Include diff --git a/Parser/myreadline.c b/Parser/myreadline.c index f511319814a..acb4d01fdf9 100644 --- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -10,7 +10,7 @@ */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #ifdef MS_WINDOWS #define WIN32_LEAN_AND_MEAN #include "windows.h" diff --git a/Parser/pgenmain.c b/Parser/pgenmain.c index 9e2159b3475..fa6c88253cd 100644 --- a/Parser/pgenmain.c +++ b/Parser/pgenmain.c @@ -16,8 +16,8 @@ #define PGEN #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "pgenheaders.h" #include "grammar.h" #include "node.h" diff --git a/Programs/python.c b/Programs/python.c index 079bf9a2f03..4c12d38c53b 100644 --- a/Programs/python.c +++ b/Programs/python.c @@ -1,7 +1,7 @@ /* Minimal main program -- everything is loaded from the library */ #include "Python.h" -#include "pycore_lifecycle.h" +#include "pycore_pylifecycle.h" #ifdef MS_WINDOWS int diff --git a/Python/_warnings.c b/Python/_warnings.c index 9b50289bb67..4065005354b 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -1,5 +1,5 @@ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "frameobject.h" #include "clinic/_warnings.c.h" diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 6781589c29c..14550fd233f 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -3,7 +3,7 @@ #include "Python.h" #include #include "ast.h" -#include "pycore_state.h" +#include "pycore_pystate.h" _Py_IDENTIFIER(__builtins__); _Py_IDENTIFIER(__dict__); diff --git a/Python/ceval.c b/Python/ceval.c index 11be8efab9b..9c0ab0663b1 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -10,7 +10,7 @@ #define PY_LOCAL_AGGRESSIVE #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "code.h" #include "dictobject.h" diff --git a/Python/codecs.c b/Python/codecs.c index 62bbee61c0a..002fad30803 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -9,7 +9,7 @@ Copyright (c) Corporation for National Research Initiatives. ------------------------------------------------------------------------ */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "ucnhash.h" #include diff --git a/Python/context.c b/Python/context.c index 1fb2a5de2b1..b548ffee3bc 100644 --- a/Python/context.c +++ b/Python/context.c @@ -1,7 +1,7 @@ #include "Python.h" #include "structmember.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "pycore_context.h" #include "pycore_hamt.h" diff --git a/Python/coreconfig.c b/Python/coreconfig.c index c81cd8bab77..7aa64e11287 100644 --- a/Python/coreconfig.c +++ b/Python/coreconfig.c @@ -1,9 +1,9 @@ #include "Python.h" #include "pycore_fileutils.h" -#include "pycore_lifecycle.h" -#include "pycore_mem.h" +#include "pycore_pylifecycle.h" +#include "pycore_pymem.h" #include "pycore_pathconfig.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include #ifdef HAVE_LANGINFO_H # include diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c index 98965607761..feebd8976d0 100644 --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -2,7 +2,7 @@ /* Support for dynamic loading of extension modules */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "importdl.h" #include diff --git a/Python/errors.c b/Python/errors.c index 4c6c34c74fa..febe9716073 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -2,7 +2,7 @@ /* Error handling */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #ifndef __STDC__ #ifndef MS_WINDOWS diff --git a/Python/frozenmain.c b/Python/frozenmain.c index 9e906666586..616090965b1 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -2,7 +2,7 @@ /* Python interpreter main program for frozen scripts */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include #ifdef MS_WINDOWS diff --git a/Python/hamt.c b/Python/hamt.c index be3813b9aab..3fe70b40faf 100644 --- a/Python/hamt.c +++ b/Python/hamt.c @@ -1,7 +1,7 @@ #include "Python.h" #include "structmember.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "pycore_hamt.h" /* diff --git a/Python/import.c b/Python/import.c index fcd88514eed..f7c37aa353c 100644 --- a/Python/import.c +++ b/Python/import.c @@ -3,10 +3,10 @@ #include "Python.h" #include "Python-ast.h" -#include "pycore_hash.h" -#include "pycore_lifecycle.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pyhash.h" +#include "pycore_pylifecycle.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "errcode.h" #include "marshal.h" #include "code.h" diff --git a/Python/pathconfig.c b/Python/pathconfig.c index 2d8b417d31f..6a868805982 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -2,10 +2,10 @@ #include "Python.h" #include "osdefs.h" -#include "pycore_mem.h" #include "pycore_fileutils.h" #include "pycore_pathconfig.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include #ifdef __cplusplus diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 318d7cb4ba2..4ccea2ece20 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -5,10 +5,10 @@ #include "Python-ast.h" #include "pycore_context.h" #include "pycore_hamt.h" -#include "pycore_lifecycle.h" -#include "pycore_mem.h" #include "pycore_pathconfig.h" -#include "pycore_state.h" +#include "pycore_pylifecycle.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #include "grammar.h" #include "node.h" #include "token.h" diff --git a/Python/pystate.c b/Python/pystate.c index c193a10c8cb..f86f5a96f07 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -2,8 +2,8 @@ /* Thread and interpreter state structures and their interfaces */ #include "Python.h" -#include "pycore_mem.h" -#include "pycore_state.h" +#include "pycore_pymem.h" +#include "pycore_pystate.h" #define _PyThreadState_SET(value) \ _Py_atomic_store_relaxed(&_PyRuntime.gilstate.tstate_current, \ diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 2b9f4f0415d..1bf822ceadb 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -11,7 +11,7 @@ #include "Python.h" #include "Python-ast.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "grammar.h" #include "node.h" #include "token.h" diff --git a/Python/symtable.c b/Python/symtable.c index 40f91789c63..c095c82eea8 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -1,5 +1,5 @@ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "symtable.h" #include "structmember.h" diff --git a/Python/sysmodule.c b/Python/sysmodule.c index c0f168c6382..99cab2b4d9e 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -17,10 +17,10 @@ Data members: #include "Python.h" #include "code.h" #include "frameobject.h" -#include "pycore_lifecycle.h" -#include "pycore_mem.h" +#include "pycore_pylifecycle.h" +#include "pycore_pymem.h" #include "pycore_pathconfig.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "pythread.h" #include "osdefs.h" diff --git a/Python/thread.c b/Python/thread.c index 63553816b35..c5364f91948 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -6,7 +6,7 @@ Stuff shared by all thread_*.h files is collected here. */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #ifndef _POSIX_THREADS /* This means pthreads are not implemented in libc headers, hence the macro diff --git a/Python/traceback.c b/Python/traceback.c index e2070f08a5a..daaf2877549 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -2,7 +2,7 @@ /* Traceback implementation */ #include "Python.h" -#include "pycore_state.h" +#include "pycore_pystate.h" #include "code.h" #include "frameobject.h"