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

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"
 
 

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.

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)
 

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

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"

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"
 

Modules/_xxsubinterpretersmodule.c

@@ -4,7 +4,7 @@
 
 #include "Python.h"
 #include "frameobject.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 
 
 static char *

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() */

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>

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>
 

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. */

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"

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"

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"

Objects/call.c

@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "frameobject.h"
 
 

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)

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)

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 {

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]

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() */
 

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"
 

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"

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"
 

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"

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

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

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>
 

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

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;

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"
 

Objects/obmalloc.c

@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_mem.h"
+#include "pycore_pymem.h"
 
 #include <stdbool.h>
 

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>

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 */

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 *

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]

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"
 

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"

PC/getpathp.c

@@ -80,7 +80,7 @@
 
 
 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "osdefs.h"
 #include <wchar.h>
 

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" />

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">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Include\internal\pycore_mem.h">
-      <Filter>Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_pathconfig.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pycore_state.h">
+    <ClInclude Include="..\Include\internal\pycore_pyhash.h">
+      <Filter>Include</Filter>
+    </ClInclude>
+    <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_pystate.h">
       <Filter>Include</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_warnings.h">

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"

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"

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

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"
 

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__);

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"

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>
 

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"
 

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>

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>

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

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

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"
 
 /*

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"

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

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"

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, \

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"

Python/symtable.c

@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "symtable.h"
 #include "structmember.h"
 

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"

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

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"