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

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 01f214045c5026247f235a9960c7d8942976719f..4f5545aaa45fabd2f2769b2242cece55efdf7bbf 100644 (file)
--- 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 b30c3187b678af0303e252bde32e18cc699b9bf6..58499ea35b4741d469357e95e203159350923693 100644 (file)
--- 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 15f3687be5b19a9fce5ba5a49c723eb925a4ba7a..87a84eb68083ae3acc256b7dc0b01febb3f54ea6 100644 (file)
--- 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 692c3b3563ad923a4837d7ea4c92a368c5e77f27..773102bb5900faeccd8f71174accec1a0fdbaa04 100644 (file)
--- 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 24ae963b2b89612d0888ee08760cd146249f680a..e1e45dc8fae08e5a0939cea733341467149bce84 100644 (file)
--- 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 ad65188d7a4235fd28d0e3fc88ad5df2ac03b1f3..72d044c08a10cae836d31d76b642d179d2c20ef2 100644 (file)
--- 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 fb0b83add5f702bf936f721f02c50c2d905b25a4..33509ef4ded5667876125342cb751db21f3367a4 100644 (file)
--- 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 a54be07b27a854c1a5513c3022a90d434aa0e8d2..48b470006c4a6e3f3781b213eb988eba586b8e73 100644 (file)
--- 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 6b443f62b0549b4d596fc73bd16631db09831840..18df795c93fc96d8fa9f191c93457b426f88ca4f 100644 (file)
--- 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 <sys/types.h>
 #include <string.h>

diff --git a/Modules/main.c b/Modules/main.c
index c847d1acedb737e4e913a0f9414a55c7af3e3de8..281707ae5b24a04ff952ce0f116b9695be237645 100644 (file)
--- 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 <locale.h>
 

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index bf886e31d762947896980a20c741cef161d4cb53..bf3e03e68084a1257945a2e2a77306ec075dee7a 100644 (file)
--- 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 be4758d94513517dc16b64efa5aac7a1e48cfc28..567da2d6b50c495bd70cc9a4959a7a2ae7f57a29 100644 (file)
--- 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 <ctype.h>
 #include "structmember.h" /* we need the offsetof() macro from there */
 #include "longintrepr.h"

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 7a0c340c804ee84feafbb14b9a156ecdb1128d90..561b06cdf967a6aa00f5b6cc1fb605b8e39f945e 100644 (file)
--- 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 c912fc04fd4cb876810a9c84fc466b9f07749765..fac12f55210e726537cb382fec022b3c3a4ee195 100644 (file)
--- 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 707b49a67ee76da2550dd50b7cd3a6cbd147a5bb..7c452b99d1176812b6d712fc0374d026bb59c29f 100644 (file)
--- 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 0b390c78f04e20b92e2c42dfb068ed894c9317a5..7605bcf7bc9b4a2771b47f48baa04397abb91db4 100644 (file)
--- 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 93d1c67f1b4358c0f2a88d430aefeaffbe21bb5d..79b0562f7d5f48f95da23bd615e4649b0f846f2e 100644 (file)
--- 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 245021350425d02fd9ea6a6bc384e4e35912bc93..a2efa7ed03f5bb255124e4bae525dc74182ae52f 100644 (file)
--- 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 17d0f5a005a24d8b5db4e06c276ff9f44833760b..ca814bf78a69dd77e85e3a31c8ad361b3ba29c55 100644 (file)
--- 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 08ec9e254ab2988690b7c731ad57c9cbaaf59a2e..ca383a193d3f5716e50ae7e0af7c32cc36adbc5f 100644 (file)
--- 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 da79260ab3b8118b36a00e8a675cbc02af511d9c..5ab127111cafb2bb59c2b32f5737e1fb60955b54 100644 (file)
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -6,8 +6,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 "osdefs.h"
 

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 7704022dd2e41a94bf6324f042e9e6a64b8d6f5c..70cf5807130e03af54fee1893bb87f4b3287c693 100644 (file)
--- 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 86488217ec83d05ea7f53a3d0dd3fd92b37d01e9..a8e11a9a2d3d3a7e56818f6299fd217a67cc775e 100644 (file)
--- 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 7c2948bb52d0f6c43d2c6d0c46b3b91ca8dd170b..98c939446e8f5adc06438da32f5fa8fe1bc971cb 100644 (file)
--- 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 23f0639db2f10d5ea39a438d85ab238bf0449e51..64bf92382be4bb91d41c6eb6370b391ffd6b20ca 100644 (file)
--- 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 ffd91a63e32379a91d61e6e6601d685e112a0cd7..44160abae6eed4f2f2b455857f7497292efe5e59 100644 (file)
--- 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 f234bb4117dca506f408626dade5183a23a26d75..060ae4dd3cd0f2fa32bfc6dfa298821b06388880 100644 (file)
--- 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 <stddef.h>
 

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index b0bbfa2f5f9d65359fc036618256359c70b517d4..cfea8cf410d7f39ee685956702b18fa97c406159 100644 (file)
--- 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 7fb711a1cb079cd5cb98dea178cd589081310d68..fca8521f5f0141a5e8e1f445a3c04f6e327f8cb1 100644 (file)
--- 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 72e2684820cea1eed835de53a685ed101d1f047d..801b205c9b6bd0928056d5ba153e1aa1edc48190 100644 (file)
--- 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 2cf024c352b8d08c854872a0fd675a3f0fa1c94d..1c2a32050f9381e0a8aab3591a42e191e8401644 100644 (file)
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_mem.h"
+#include "pycore_pymem.h"
 
 #include <stdbool.h>
 

diff --git a/Objects/odictobject.c b/Objects/odictobject.c
index 52ac7e5f88b0c7a0f2ee36a3cce7f838ed5ea36f..13bc972039f3ad0130f6e222d64e6b38b53345f3 100644 (file)
--- 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 <stddef.h>

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 035b1db06d8ca0f5e3b2afdda1c24bd8199d077a..b11cb3a58696d505a8b49196ce9c99988d8c843e 100644 (file)
--- 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 9f1cf78cedd31ebe3eb7ba4960ecc9e5e3d6ae43..1f79faa3e6cad5ed6aabfa58cd50c15d06546806 100644 (file)
--- 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 c997bc6fa2d0cf03afb97902b14f6ae54e3abed1..e7ba09d71d33ae796dc749b513be64a2e14e8384 100644 (file)
--- 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 dedc4f7c8764316dd1c53fb035c639b1627c1425..682d44696e5a97fef7613cdb986e4b9409c97e60 100644 (file)
--- 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 5338781edc2fd496eb9acaced49c4d3017131903..e5d026f9aa0e5d01ebeb961b2e78bef50f24966b 100644 (file)
--- 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 3a62738d23372f87df1950dd518689ea9ca2cd0b..ee9d3d258f685731f27eb9d176408699c0513c50 100644 (file)
--- 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 <wchar.h>
 

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 460500cc2b1bfd843e4d6002ff87cab70fe7f8c7..0ae24fade13db6c422daadf84d120146a453e58d 100644 (file)
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -119,10 +119,11 @@
     <ClInclude Include="..\Include\internal\pycore_getopt.h" />
     <ClInclude Include="..\Include\internal\pycore_gil.h" />
     <ClInclude Include="..\Include\internal\pycore_hamt.h" />
-    <ClInclude Include="..\Include\internal\pycore_lifecycle.h" />
-    <ClInclude Include="..\Include\internal\pycore_mem.h" />
     <ClInclude Include="..\Include\internal\pycore_pathconfig.h" />
-    <ClInclude Include="..\Include\internal\pycore_state.h" />
+    <ClInclude Include="..\Include\internal\pycore_pyhash.h" />
+    <ClInclude Include="..\Include\internal\pycore_pylifecycle.h" />
+    <ClInclude Include="..\Include\internal\pycore_pymem.h" />
+    <ClInclude Include="..\Include\internal\pycore_pystate.h" />
     <ClInclude Include="..\Include\internal\pycore_warnings.h" />
     <ClInclude Include="..\Include\intrcheck.h" />
     <ClInclude Include="..\Include\iterobject.h" />

diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 64fb77b867c4351f68faf8e0f22be692cf3e7a20..ef5ef7268a39aca6c7c238aa006b75a35bb80ec7 100644 (file)
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -156,16 +156,19 @@
     <ClInclude Include="..\Include\internal\pycore_hamt.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pycore_lifecycle.h">
+    <ClInclude Include="..\Include\internal\pycore_pathconfig.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pycore_mem.h">
+    <ClInclude Include="..\Include\internal\pycore_pyhash.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pycore_pathconfig.h">
+    <ClInclude Include="..\Include\internal\pycore_pylifecycle.h">
+      <Filter>Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\internal\pycore_pymem.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pycore_state.h">
+    <ClInclude Include="..\Include\internal\pycore_pystate.h">
       <Filter>Include</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_warnings.h">

diff --git a/Parser/myreadline.c b/Parser/myreadline.c
index f511319814a5f407258a09224b59aeecb6ff55bf..acb4d01fdf927962c2439e39f192f15bac261e51 100644 (file)
--- 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 9e2159b3475954552602d1eb7f65086d94878c24..fa6c88253cdd3f2985328200ba3c48970fd1ec1d 100644 (file)
--- 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 079bf9a2f03961013b137493da7f349642e8d474..4c12d38c53b9962534f3068df25128bb02288f66 100644 (file)
--- 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 9b50289bb67bcbd887262ce8b44284a52ad84de9..4065005354b84e26a4997451e215b962f7ca4c34 100644 (file)
--- 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 6781589c29cffae80b8bf241f86e8b2f35ee0c2b..14550fd233f4ff8a20f571c9be7303210faca7f1 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -3,7 +3,7 @@
 #include "Python.h"
 #include <ctype.h>
 #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 11be8efab9b963540913304f19f79584683b004a..9c0ab0663b14d3b182cb4d9142656551c246ba20 100644 (file)
--- 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 62bbee61c0a3b5275728516c1d8078b63bc3fcf2..002fad3080388ed78feec9b2bfe1ced2e2a286f3 100644 (file)
--- 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 <ctype.h>
 

diff --git a/Python/context.c b/Python/context.c
index 1fb2a5de2b1b818612834c962dac90a0781b38e9..b548ffee3bc0903271156416fe01197ea3c174da 100644 (file)
--- 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 c81cd8bab775d4a38d2ebec86f3ded68f0ae6f65..7aa64e112876f4ced5b34792c500ecbb01ab16d8 100644 (file)
--- 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 <locale.h>
 #ifdef HAVE_LANGINFO_H
 #  include <langinfo.h>

diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
index 98965607761aa43a66b4ca461a362a24f4112b3b..feebd8976d0adb14ec19d6ba475ef6e62d435b9a 100644 (file)
--- 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 <sys/types.h>

diff --git a/Python/errors.c b/Python/errors.c
index 4c6c34c74fa681f0cfecabbc757982dc3fd94b47..febe9716073a29258960a7cc2625445de8788b53 100644 (file)
--- 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 9e906666586716e155f93f21cb043e1f294c5078..616090965b1351b463cdb0fd0e2152e8c98bf160 100644 (file)
--- 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 <locale.h>
 
 #ifdef MS_WINDOWS

diff --git a/Python/hamt.c b/Python/hamt.c
index be3813b9aab175379a1caa3360221f5d757fe42c..3fe70b40fafc345ada28b76edd7dac23b30de636 100644 (file)
--- 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 fcd88514eed5bf8009c93c16122a1fa15ada015f..f7c37aa353c8c3b40cb9bd2b374381f2aa6d52ae 100644 (file)
--- 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 2d8b417d31f7facad0b62c3095d1c4153421b3a2..6a8688059825bf923687419cd38fd27360443352 100644 (file)
--- 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 <wchar.h>
 
 #ifdef __cplusplus

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 318d7cb4ba26324cbffeff906fc3452501b97882..4ccea2ece207fbe05074b35a13a3b3af447bdbb5 100644 (file)
--- 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 c193a10c8cb290b206fd8df8529fb60a8013ce35..f86f5a96f07450d4a4a078a22686f62cfde1e0ba 100644 (file)
--- 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 2b9f4f0415d65ec6e63ca00adc788aea30bbfa6e..1bf822ceadb483e2fdb30151b48de720b9ffa7cd 100644 (file)
--- 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 40f91789c63c01228f461ba39b359020eef8df29..c095c82eea8fb2ceef4c1fc8cd8e5977e463eceb 100644 (file)
--- 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 c0f168c63820527d7a4555aab504676cdef0f2ac..99cab2b4d9e36992165bd2a2c1c035185c987156 100644 (file)
--- 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 63553816b350e3b76c809c6c8237d589d15a8673..c5364f91948f86eff1be71136f578733dc8823db 100644 (file)
--- 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 e2070f08a5a272dea628b2c2677d683da8f9cad0..daaf2877549154757bfefa7314c2ce86ee24701c 100644 (file)
--- 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"