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/Python/_warnings.c b/Python/_warnings.c
index 9b50289..4065005 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 6781589..14550fd 100644
--- 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 11be8ef..9c0ab06 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 62bbee6..002fad30 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -9,7 +9,7 @@
------------------------------------------------------------------------ */
#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 1fb2a5d..b548ffe 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 c81cd8b..7aa64e1 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 <locale.h>
#ifdef HAVE_LANGINFO_H
# include <langinfo.h>
diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
index 9896560..feebd89 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 <sys/types.h>
diff --git a/Python/errors.c b/Python/errors.c
index 4c6c34c..febe971 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 9e90666..6160909 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 <locale.h>
#ifdef MS_WINDOWS
diff --git a/Python/hamt.c b/Python/hamt.c
index be3813b..3fe70b40 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 fcd8851..f7c37aa 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 2d8b417..6a86880 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 <wchar.h>
#ifdef __cplusplus
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 318d7cb..4ccea2e 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 c193a10..f86f5a9 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 2b9f4f0..1bf822c 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 40f9178..c095c82 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 c0f168c..99cab2b 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -17,10 +17,10 @@
#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 6355381..c5364f9 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 e2070f0..daaf287 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"