bpo-35081: Add pycore_ prefix to internal header files (GH-10263)

* Rename Include/internal/ header files:

  * pyatomic.h -> pycore_atomic.h
  * ceval.h -> pycore_ceval.h
  * condvar.h -> pycore_condvar.h
  * context.h -> pycore_context.h
  * pygetopt.h -> pycore_getopt.h
  * gil.h -> pycore_gil.h
  * hamt.h -> pycore_hamt.h
  * hash.h -> pycore_hash.h
  * mem.h -> pycore_mem.h
  * pystate.h -> pycore_state.h
  * warnings.h -> pycore_warnings.h

* PCbuild project, Makefile.pre.in, Modules/Setup: add the
  Include/internal/ directory to the search paths of header files.
* Update includes. For example, replace #include "internal/mem.h"
  with #include "pycore_mem.h".

diff --git a/Include/internal/pyatomic.h b/Include/internal/pycore_atomic.h
similarity index 100%
rename from Include/internal/pyatomic.h
rename to Include/internal/pycore_atomic.h

diff --git a/Include/internal/ceval.h b/Include/internal/pycore_ceval.h
similarity index 96%
rename from Include/internal/ceval.h
rename to Include/internal/pycore_ceval.h
index 4297b5a51ce42fb763771a0fe6e48930b4a00b99..ddeeb5c4256f50641387e4f4cbe2f0fa5b3cf8eb 100644 (file)
--- a/Include/internal/ceval.h
+++ b/Include/internal/pycore_ceval.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include "internal/pyatomic.h"
+#include "pycore_atomic.h"
 #include "pythread.h"
 
 struct _pending_calls {
@@ -25,7 +25,7 @@ struct _pending_calls {
     int last;
 };
 
-#include "internal/gil.h"
+#include "pycore_gil.h"
 
 struct _ceval_runtime_state {
     int recursion_limit;

diff --git a/Include/internal/condvar.h b/Include/internal/pycore_condvar.h
similarity index 100%
rename from Include/internal/condvar.h
rename to Include/internal/pycore_condvar.h

diff --git a/Include/internal/context.h b/Include/internal/pycore_context.h
similarity index 96%
rename from Include/internal/context.h
rename to Include/internal/pycore_context.h
index 59f88f2614e97d9515024da092e580da7c6ae31f..57a410c06f687a162625aaffc2f7f11631f847c1 100644 (file)
--- a/Include/internal/context.h
+++ b/Include/internal/pycore_context.h
@@ -2,7 +2,7 @@
 #define Py_INTERNAL_CONTEXT_H
 
 
-#include "internal/hamt.h"
+#include "pycore_hamt.h"
 
 
 struct _pycontextobject {

diff --git a/Include/internal/pygetopt.h b/Include/internal/pycore_getopt.h
similarity index 100%
rename from Include/internal/pygetopt.h
rename to Include/internal/pycore_getopt.h

diff --git a/Include/internal/gil.h b/Include/internal/pycore_gil.h
similarity index 95%
rename from Include/internal/gil.h
rename to Include/internal/pycore_gil.h
index 7743b3f0aa8b76ee39d5edafc52ae15fde3ed085..5059850d76f85a55096a6c677ec7526db30a60bd 100644 (file)
--- a/Include/internal/gil.h
+++ b/Include/internal/pycore_gil.h
@@ -4,8 +4,8 @@
 extern "C" {
 #endif
 
-#include "internal/condvar.h"
-#include "internal/pyatomic.h"
+#include "pycore_condvar.h"
+#include "pycore_atomic.h"
 
 #ifndef Py_HAVE_CONDVAR
 #  error You need either a POSIX-compatible or a Windows system!

diff --git a/Include/internal/hamt.h b/Include/internal/pycore_hamt.h
similarity index 100%
rename from Include/internal/hamt.h
rename to Include/internal/pycore_hamt.h

diff --git a/Include/internal/hash.h b/Include/internal/pycore_hash.h
similarity index 100%
rename from Include/internal/hash.h
rename to Include/internal/pycore_hash.h

diff --git a/Include/internal/mem.h b/Include/internal/pycore_mem.h
similarity index 100%
rename from Include/internal/mem.h
rename to Include/internal/pycore_mem.h

diff --git a/Include/internal/pystate.h b/Include/internal/pycore_state.h
similarity index 98%
rename from Include/internal/pystate.h
rename to Include/internal/pycore_state.h
index 38845d32ecafab2ff5ae3091d5e83976edddf68b..ff25d2ebf449affcd35b2c548de559e9775d1af0 100644 (file)
--- a/Include/internal/pystate.h
+++ b/Include/internal/pycore_state.h
@@ -7,9 +7,9 @@ extern "C" {
 #include "pystate.h"
 #include "pythread.h"
 
-#include "internal/mem.h"
-#include "internal/ceval.h"
-#include "internal/warnings.h"
+#include "pycore_mem.h"
+#include "pycore_ceval.h"
+#include "pycore_warnings.h"
 
 
 /* GIL state */

diff --git a/Include/internal/warnings.h b/Include/internal/pycore_warnings.h
similarity index 100%
rename from Include/internal/warnings.h
rename to Include/internal/pycore_warnings.h

diff --git a/Include/pystate.h b/Include/pystate.h
index 8860f124002c169682713d387da5426f029a0d51..7fc921e9ac7364d97b0cc66b694d87f1f8b88314 100644 (file)
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -250,7 +250,7 @@ PyAPI_FUNC(PyInterpreterState *) _PyInterpreterState_Get(void);
 #endif
 #ifdef Py_BUILD_CORE
    /* Macro which should only be used for performance critical code.
-      Need "#include "internal/pystate.h". See also _PyInterpreterState_Get()
+      Need "#include "pycore_state.h". See also _PyInterpreterState_Get()
       and _PyGILState_GetInterpreterStateUnsafe(). */
 #  define _PyInterpreterState_GET_UNSAFE() (PyThreadState_GET()->interp)
 #endif

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 232025f1cb6141b1b29d41cb92228fc0026b0d9a..0336290dd84131327576003e4041804d34e5a5d9 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -91,7 +91,7 @@ CONFIGURE_LDFLAGS=    @LDFLAGS@
 # command line to append to these values without stomping the pre-set
 # values.
 PY_CFLAGS=     $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
+PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) -I$(srcdir)/Include/internal
 # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
 # be able to build extension modules using the directories specified in the
 # environment variables
@@ -1025,14 +1025,14 @@ PYTHON_HEADERS= \
                pyconfig.h \
                $(PARSER_HEADERS) \
                $(srcdir)/Include/Python-ast.h \
-               $(srcdir)/Include/internal/ceval.h \
-               $(srcdir)/Include/internal/gil.h \
-               $(srcdir)/Include/internal/mem.h \
-               $(srcdir)/Include/internal/pyatomic.h \
-               $(srcdir)/Include/internal/pygetopt.h \
-               $(srcdir)/Include/internal/pystate.h \
-               $(srcdir)/Include/internal/context.h \
-               $(srcdir)/Include/internal/warnings.h \
+               $(srcdir)/Include/internal/pycore_atomic.h \
+               $(srcdir)/Include/internal/pycore_ceval.h \
+               $(srcdir)/Include/internal/pycore_context.h \
+               $(srcdir)/Include/internal/pycore_getopt.h \
+               $(srcdir)/Include/internal/pycore_gil.h \
+               $(srcdir)/Include/internal/pycore_mem.h \
+               $(srcdir)/Include/internal/pycore_state.h \
+               $(srcdir)/Include/internal/pycore_warnings.h \
                $(DTRACE_HEADERS)
 
 $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS)

diff --git a/Modules/Setup b/Modules/Setup
index fb16698d2fc18eece2526d6bf549bf11a7887ff4..c1804630b903170638742d039ff810d6cd85984b 100644 (file)
--- a/Modules/Setup
+++ b/Modules/Setup
@@ -101,29 +101,29 @@ PYTHONPATH=$(COREPYTHONPATH)
 # This only contains the minimal set of modules required to run the
 # setup.py script in the root of the Python source tree.
 
-posix -DPy_BUILD_CORE posixmodule.c    # posix (UNIX) system calls
+posix -DPy_BUILD_CORE -I$(srcdir)/Include/internal posixmodule.c # posix (UNIX) system calls
 errno errnomodule.c                    # posix (UNIX) errno values
 pwd pwdmodule.c                                # this is needed to find out the user's home dir
                                        # if $HOME is not set
 _sre _sre.c                            # Fredrik Lundh's new regular expressions
 _codecs _codecsmodule.c                        # access to the builtin codecs and codec registry
 _weakref _weakref.c                    # weak references
-_functools -DPy_BUILD_CORE _functoolsmodule.c   # Tools for working with functions and callable objects
+_functools -DPy_BUILD_CORE -I$(srcdir)/Include/internal _functoolsmodule.c   # Tools for working with functions and callable objects
 _operator _operator.c                  # operator.add() and similar goodies
 _collections _collectionsmodule.c      # Container types
 _abc _abc.c                            # Abstract base classes
 itertools itertoolsmodule.c            # Functions creating iterators for efficient looping
 atexit atexitmodule.c                  # Register functions to be run at interpreter-shutdown
-_signal -DPy_BUILD_CORE signalmodule.c
+_signal -DPy_BUILD_CORE -I$(srcdir)/Include/internal signalmodule.c
 _stat _stat.c                          # stat.h interface
-time -DPy_BUILD_CORE timemodule.c      # -lm # time operations and variables
-_thread -DPy_BUILD_CORE _threadmodule.c        # low-level threading interface
+time -DPy_BUILD_CORE -I$(srcdir)/Include/internal timemodule.c # -lm # time operations and variables
+_thread -DPy_BUILD_CORE -I$(srcdir)/Include/internal _threadmodule.c   # low-level threading interface
 
 # access to ISO C locale support
 _locale _localemodule.c  # -lintl
 
 # Standard I/O baseline
-_io -DPy_BUILD_CORE -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
+_io -DPy_BUILD_CORE -I$(srcdir)/Include/internal -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
 
 # faulthandler module
 faulthandler faulthandler.c

diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index ff4172d663b65f115e68bb28262c156be2449990..6c28b274e561ee31fe009a91f2a9af3568932746 100644 (file)
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -1,7 +1,7 @@
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "structmember.h"
 
 /* _functools module written and maintained

diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 2eb5262f0f7bc239f932714c47432f672ce9e282..24ae963b2b89612d0888ee08760cd146249f680a 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 "internal/pystate.h"
+#include "pycore_state.h"
 #include "structmember.h"
 #include "pythread.h"
 #include "_iomodule.h"

diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index d33fa9924308c6aec5090de3f6c4418c335bd195..ad65188d7a4235fd28d0e3fc88ad5df2ac03b1f3 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 "internal/pystate.h"
+#include "pycore_state.h"
 #include "structmember.h" /* offsetof */
 #include "pythread.h"
 

diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
index 2eb87871694db0c592ffaddc3268a3c6ce2f4de2..fb0b83add5f702bf936f721f02c50c2d905b25a4 100644 (file)
--- a/Modules/_xxsubinterpretersmodule.c
+++ b/Modules/_xxsubinterpretersmodule.c
@@ -4,7 +4,7 @@
 
 #include "Python.h"
 #include "frameobject.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 
 
 static char *

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 4773c79b53289b891151d03d4c0534def57b4797..a54be07b27a854c1a5513c3022a90d434aa0e8d2 100644 (file)
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -24,9 +24,9 @@
 */
 
 #include "Python.h"
-#include "internal/context.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_context.h"
+#include "pycore_mem.h"
+#include "pycore_state.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 521bc6e35ed3ee99ddaed043889ab7b3af46ab2f..53e5c2b889a65fb86bad6ea5c750457eb60dffff 100644 (file)
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -1,7 +1,7 @@
 /* Return the initial module search path. */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "osdefs.h"
 
 #include <sys/types.h>

diff --git a/Modules/main.c b/Modules/main.c
index 6a8aa05fc370eaca6e8d63aa419573429991ea92..1918f4f9b8ff02490772b50b81a811956c7de3c8 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -2,9 +2,9 @@
 
 #include "Python.h"
 #include "osdefs.h"
-#include "internal/mem.h"
-#include "internal/pygetopt.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_getopt.h"
+#include "pycore_state.h"
 
 #include <locale.h>
 

diff --git a/Modules/makesetup b/Modules/makesetup
index c7b0a60400cf29e06b2621e9b29417aeeec7c27f..bf5ca3902b5663059bf9f20bbb1270f93a640b01 100755 (executable)
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -110,7 +110,7 @@ sed -e 's/[         ]*#.*//' -e '/^[        ]*$/d' |
        rulesf="@rules.$$"
        trap 'rm -f $rulesf' 0 1 2 3
        echo "
-# Rules appended by makedepend
+# Rules appended by makesetup
 " >$rulesf
        DEFS=
        BUILT=

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 9ccdc8eff1bd5ca864507a9fc8faeec8e47efd43..0307436e3d599da5200be4655cef249784e42c83 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -32,7 +32,7 @@
 #else
 #include "winreparse.h"
 #endif
-#include "internal/pystate.h"
+#include "pycore_state.h"
 
 /* On android API level 21, 'AT_EACCESS' is not declared although
  * HAVE_FACCESSAT is defined. */

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index a81de6ab64622c9d87dbd88b4342f3f9aa5422cc..1915fd9be456d1cdcb92d19ff2783ed6c85fa595 100644 (file)
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -4,7 +4,7 @@
 /* XXX Signals should be recorded per thread, now we have thread state. */
 
 #include "Python.h"
-#include "internal/pyatomic.h"
+#include "pycore_atomic.h"
 
 #ifndef MS_WINDOWS
 #include "posixmodule.h"

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 305910c3584ca0e507ccb86cd72f071b23932600..be4758d94513517dc16b64efa5aac7a1e48cfc28 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 "internal/pystate.h"
+#include "pycore_state.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 782e27569780f2aceeae762dbb331fe85362629b..7a0c340c804ee84feafbb14b9a156ecdb1128d90 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -2,8 +2,8 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "structmember.h"
 #include "bytes_methods.h"
 #include "bytesobject.h"

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 1b36661c84debb2fe645052738e51f3d55a08638..c912fc04fd4cb876810a9c84fc466b9f07749765 100644 (file)
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -3,8 +3,8 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 
 #include "bytes_methods.h"
 #include "pystrhex.h"

diff --git a/Objects/call.c b/Objects/call.c
index bda05738755a5e13c0860c54f62fad4b82050201..9061d0b1ac324ea7ee9e32db63b7d5e357eec1a5 100644 (file)
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "frameobject.h"
 
 

diff --git a/Objects/cellobject.c b/Objects/cellobject.c
index 7b05e61ce46fa0c68bda9dc2370c610209636db0..0b390c78f04e20b92e2c42dfb068ed894c9317a5 100644 (file)
--- a/Objects/cellobject.c
+++ b/Objects/cellobject.c
@@ -1,8 +1,8 @@
 /* Cell object implementation */
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 
 PyObject *
 PyCell_New(PyObject *obj)

diff --git a/Objects/classobject.c b/Objects/classobject.c
index c4efaf2820206bfbc2cf5362da79c918a5e851e7..93d1c67f1b4358c0f2a88d430aefeaffbe21bb5d 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 "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "structmember.h"
 
 #define TP_DESCR_GET(t) ((t)->tp_descr_get)

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index cedf11ee8af8a25262c12e74725e6c1e5c222dcb..6d8e9ac154edb33bd5587e82814c7efda9680e37 100644 (file)
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -3,7 +3,7 @@
 #include "Python.h"
 #include "code.h"
 #include "structmember.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 
 /* Holder for co_extra information */
 typedef struct {

diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 82afa8c63f866001a3dbd2eb2fe8c82889c14827..a23b97f396f90111d2445e24ca6762281fdb6a98 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 "internal/pystate.h"
+#include "pycore_state.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 363d902e9c59b0068f3f7c3aed63d99af41c0027..a9ae907d9f245aeffc746ac8ea0fb529da2dc2f7 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 "internal/pystate.h"
+#include "pycore_state.h"
 #include "dict-common.h"
 #include "stringlib/eq.h"    /* to get unicode_eq() */
 

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 6aa3d8f8e19cf3b1a42270629d876852425147d1..da79260ab3b8118b36a00e8a675cbc02af511d9c 100644 (file)
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -6,8 +6,8 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "structmember.h"
 #include "osdefs.h"
 

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 64ee386ddf9654ba7741699f3ac42e0377642250..7704022dd2e41a94bf6324f042e9e6a64b8d6f5c 100644 (file)
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -1,7 +1,7 @@
 /* Frame object implementation */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 
 #include "code.h"
 #include "frameobject.h"

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index c2f79c05dbb21b3ca7808abd2a266b4dea515ffb..e5278f09af2bddf24db556b7dbc8b384e03dabda 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -2,8 +2,8 @@
 /* Function object implementation */
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "code.h"
 #include "structmember.h"
 

diff --git a/Objects/genobject.c b/Objects/genobject.c
index 453b1003300b5a661c7e8d377031691d22d58924..885b3f2eca72ae1ee9ab9546aaab91adfd8c3ec3 100644 (file)
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -1,7 +1,7 @@
 /* Generator object implementation */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "frameobject.h"
 #include "structmember.h"
 #include "opcode.h"

diff --git a/Objects/iterobject.c b/Objects/iterobject.c
index 5f5ebfc8c0e5cdb167e8e879083552d7081b00c4..23f0639db2f10d5ea39a438d85ab238bf0449e51 100644 (file)
--- a/Objects/iterobject.c
+++ b/Objects/iterobject.c
@@ -1,8 +1,8 @@
 /* Iterator objects */
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 
 typedef struct {
     PyObject_HEAD

diff --git a/Objects/listobject.c b/Objects/listobject.c
index e85fa5c526355e780b425f988689b9bce8247371..e38b21f2a30b9991fbf0b7567b46945a269e51b5 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1,7 +1,7 @@
 /* List object implementation */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "accu.h"
 
 #ifdef STDC_HEADERS

diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index adaa67c064466bd4c77ab22d64d831e670bcbcaa..f234bb4117dca506f408626dade5183a23a26d75 100644 (file)
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -1,8 +1,8 @@
 /* Memoryview object implementation */
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "pystrhex.h"
 #include <stddef.h>
 

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 9176e39234f7c342d8b7f243b487041fc3c0c8af..b0bbfa2f5f9d65359fc036618256359c70b517d4 100644 (file)
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -2,8 +2,8 @@
 /* Method object implementation */
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.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 5181941ee7bcfa8a8f9b9f578d9ed44a9d902272..7fb711a1cb079cd5cb98dea178cd589081310d68 100644 (file)
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -2,7 +2,7 @@
 /* Module object implementation */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "structmember.h"
 
 static Py_ssize_t max_module_number;

diff --git a/Objects/object.c b/Objects/object.c
index b72ad019c796f2e7e1ea28a2a25a5ce09bd1aaea..f7395c783ae872f5a61cdbcb2074bab6d20c7bd4 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -2,8 +2,8 @@
 /* Generic object operations; and implementation of None */
 
 #include "Python.h"
-#include "internal/pystate.h"
-#include "internal/context.h"
+#include "pycore_state.h"
+#include "pycore_context.h"
 #include "frameobject.h"
 
 #ifdef __cplusplus

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 88ded83a29e41aeba00419324a73cf5c765cc85e..6a65a1572e867fe5b4bd3d9a9f94b16e49027901 100644 (file)
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "internal/mem.h"
+#include "pycore_mem.h"
 
 #include <stdbool.h>
 

diff --git a/Objects/odictobject.c b/Objects/odictobject.c
index 67c3674ee09528bde42b54e770e06ea8d0fe99ec..81c996be5615abe2410c2fc6a670bca37f63315a 100644 (file)
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -465,7 +465,7 @@ later:
 */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "structmember.h"
 #include "dict-common.h"
 #include <stddef.h>

diff --git a/Objects/setobject.c b/Objects/setobject.c
index aa1f4eedbfd432f9d4fe3f34984d18a465d4f460..42fe80fc050362540920491d8a466389c80a1495 100644 (file)
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -32,7 +32,7 @@
 */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "structmember.h"
 
 /* Object used as dummy key to fill deleted entries */

diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index 2288df5149541ba313916fe46b5ab479f59b5e5e..9f1cf78cedd31ebe3eb7ba4960ecc9e5e3d6ae43 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 "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "structmember.h"
 
 static PyObject *

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 288f1348117a40631a6133607f776f16ba8418b4..cce266f7a2d21194c8f2749d7dbc80b431a5c49d 100644 (file)
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -2,7 +2,7 @@
 /* Tuple object implementation */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "accu.h"
 
 /*[clinic input]

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 722fe5f94735c0554f047c22b444bb45ce74cbcb..9a390b3e5078014c880f9445682a1658925b024f 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1,7 +1,7 @@
 /* Type object implementation */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "frameobject.h"
 #include "structmember.h"
 

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index f3f940ac9ef573e36ffed4d3d96a5dac74b594c7..3692da64122f8678fd65a73f1b44c99cc2fc8fcc 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -40,7 +40,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "ucnhash.h"
 #include "bytes_methods.h"
 #include "stringlib/eq.h"

diff --git a/PC/getpathp.c b/PC/getpathp.c
index ada02899966a53ed1479a7250903e04a6566b47b..3a62738d23372f87df1950dd518689ea9ca2cd0b 100644 (file)
--- a/PC/getpathp.c
+++ b/PC/getpathp.c
@@ -80,7 +80,7 @@
 
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "osdefs.h"
 #include <wchar.h>
 

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 95b349c077e5bcaba0a042f482101c07faa77288..cf85e1b25d5851e6e908b3cbd718c2c423e4471a 100644 (file)
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -27,7 +27,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(PySourcePath)Include;$(PySourcePath)PC;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(PySourcePath)Include;$(PySourcePath)Include\internal;$(PySourcePath)PC;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;$(_PlatformPreprocessorDefinition)$(_DebugPreprocessorDefinition)$(_PydPreprocessorDefinition)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       
       <Optimization>MaxSpeed</Optimization>
@@ -194,4 +194,4 @@ public override bool Execute() {
     <Error Text="Unable to locate signtool.exe. Set /p:SignToolPath and rebuild" Condition="'$(_SignCommand)' == ''" />
     <Exec Command='$(_SignCommand) "$(TargetPath)" || $(_SignCommand) "$(TargetPath)" || $(_SignCommand) "$(TargetPath)"' ContinueOnError="false" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index f65bb5b2197c8e15726792c1e7ab8d026e1962c3..ebc35a7c0049999a300b75dccbc572c2511d6a4d 100644 (file)
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -112,15 +112,16 @@
     <ClInclude Include="..\Include\graminit.h" />
     <ClInclude Include="..\Include\grammar.h" />
     <ClInclude Include="..\Include\import.h" />
-    <ClInclude Include="..\Include\internal\ceval.h" />
-    <ClInclude Include="..\Include\internal\condvar.h" />
-    <ClInclude Include="..\Include\internal\context.h" />
-    <ClInclude Include="..\Include\internal\gil.h" />
-    <ClInclude Include="..\Include\internal\hamt.h" />
-    <ClInclude Include="..\Include\internal\mem.h" />
-    <ClInclude Include="..\Include\internal\pyatomic.h" />
-    <ClInclude Include="..\Include\internal\pystate.h" />
-    <ClInclude Include="..\Include\internal\warnings.h" />
+    <ClInclude Include="..\Include\internal\pycore_atomic.h" />
+    <ClInclude Include="..\Include\internal\pycore_ceval.h" />
+    <ClInclude Include="..\Include\internal\pycore_condvar.h" />
+    <ClInclude Include="..\Include\internal\pycore_context.h" />
+    <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_mem.h" />
+    <ClInclude Include="..\Include\internal\pycore_state.h" />
+    <ClInclude Include="..\Include\internal\pycore_warnings.h" />
     <ClInclude Include="..\Include\intrcheck.h" />
     <ClInclude Include="..\Include\iterobject.h" />
     <ClInclude Include="..\Include\listobject.h" />

diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 7fdadc81676df7798b9dcc9f303fc83d1f3f2f64..052c89cf806ce20dda7da75ba8b4a954c93741de 100644 (file)
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -135,31 +135,34 @@
     <ClInclude Include="..\Include\import.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\ceval.h">
+    <ClInclude Include="..\Include\internal\pycore_atomic.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\condvar.h">
+    <ClInclude Include="..\Include\internal\pycore_ceval.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\context.h">
+    <ClInclude Include="..\Include\internal\pycore_condvar.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\gil.h">
+    <ClInclude Include="..\Include\internal\pycore_context.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\hamt.h">
+    <ClInclude Include="..\Include\internal\pycore_getopt.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\mem.h">
+    <ClInclude Include="..\Include\internal\pycore_gil.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pyatomic.h">
+    <ClInclude Include="..\Include\internal\pycore_hamt.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pystate.h">
+    <ClInclude Include="..\Include\internal\pycore_mem.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\warnings.h">
+    <ClInclude Include="..\Include\internal\pycore_state.h">
+      <Filter>Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\internal\pycore_warnings.h">
       <Filter>Include</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\intrcheck.h">
@@ -249,9 +252,6 @@
     <ClInclude Include="..\Include\pyfpe.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pygetopt.h">
-      <Filter>Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\pylifecycle.h">
       <Filter>Include</Filter>
     </ClInclude>

diff --git a/Parser/myreadline.c b/Parser/myreadline.c
index edb291a6691a78fffed1f905de9092d558da58e0..d18cf1b61bacfaf8035740bfa4e4d937d54325f7 100644 (file)
--- a/Parser/myreadline.c
+++ b/Parser/myreadline.c
@@ -10,7 +10,7 @@
 */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #ifdef MS_WINDOWS
 #define WIN32_LEAN_AND_MEAN
 #include "windows.h"

diff --git a/Parser/pgenmain.c b/Parser/pgenmain.c
index 0a4b0c5da02982ffb92c06a5fbf44d7481ccddee..9e2159b3475954552602d1eb7f65086d94878c24 100644 (file)
--- a/Parser/pgenmain.c
+++ b/Parser/pgenmain.c
@@ -16,8 +16,8 @@
 #define PGEN
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "pgenheaders.h"
 #include "grammar.h"
 #include "node.h"

diff --git a/Python/_warnings.c b/Python/_warnings.c
index 8e1c01d0b295470fcb42d75d32b65fcfe4cb0981..619ec6f26b49cd05edd6eb530abd73e89eaa03fa 100644 (file)
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "frameobject.h"
 #include "clinic/_warnings.c.h"
 

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 8001c603939a70dbac81141021ef139136bcaf50..6c8672adfc1537c4299dfbe6c8fd75ec566e286a 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -2,7 +2,7 @@
 
 #include "Python.h"
 #include "Python-ast.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 
 #include "node.h"
 #include "code.h"

diff --git a/Python/ceval.c b/Python/ceval.c
index 64431238484355067b6e787f1bf5908ec228eafd..5599b6efa3e37d90015f7795c5cdcbf2cf8ccae3 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -10,7 +10,7 @@
 #define PY_LOCAL_AGGRESSIVE
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 
 #include "code.h"
 #include "dictobject.h"

diff --git a/Python/ceval_gil.h b/Python/ceval_gil.h
index 4a054a97f7108217ef42284b660458e6aa14945a..f2d5fdba0153643ba35aa62aef52dc77637b19c8 100644 (file)
--- a/Python/ceval_gil.h
+++ b/Python/ceval_gil.h
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "internal/pyatomic.h"
+#include "pycore_atomic.h"
 
 /* First some general settings */
 

diff --git a/Python/codecs.c b/Python/codecs.c
index 4062429fe35414d9275cc160fa24c82f42dd4831..62bbee61c0a3b5275728516c1d8078b63bc3fcf2 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 "internal/pystate.h"
+#include "pycore_state.h"
 #include "ucnhash.h"
 #include <ctype.h>
 

diff --git a/Python/condvar.h b/Python/condvar.h
index 951b8ad47f07beaafb79c39498128ca8341e59ec..13517409aeab03f0336623b12149531e420ec44c 100644 (file)
--- a/Python/condvar.h
+++ b/Python/condvar.h
@@ -41,7 +41,7 @@
 #define _CONDVAR_IMPL_H_
 
 #include "Python.h"
-#include "internal/condvar.h"
+#include "pycore_condvar.h"
 
 #ifdef _POSIX_THREADS
 /*

diff --git a/Python/context.c b/Python/context.c
index 7344e968cceef911d7269b934cdda6373f8a06b7..b1f67b5aa75b08e6c49c13634765ed1245eb823b 100644 (file)
--- a/Python/context.c
+++ b/Python/context.c
@@ -1,9 +1,9 @@
 #include "Python.h"
 
 #include "structmember.h"
-#include "internal/pystate.h"
-#include "internal/context.h"
-#include "internal/hamt.h"
+#include "pycore_state.h"
+#include "pycore_context.h"
+#include "pycore_hamt.h"
 
 
 #define CONTEXT_FREELIST_MAXLEN 255

diff --git a/Python/coreconfig.c b/Python/coreconfig.c
index 81086f42d679c687ae5228bada643f60d0f71ab9..ad14a8a457dac6fb1abdb704cafb6dc6fa6a0f54 100644 (file)
--- a/Python/coreconfig.c
+++ b/Python/coreconfig.c
@@ -1,6 +1,6 @@
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include <locale.h>
 #ifdef HAVE_LANGINFO_H
 #  include <langinfo.h>

diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
index 73ae26d13146bde256c2eafc3069c37b2abb4484..98965607761aa43a66b4ca461a362a24f4112b3b 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 "internal/pystate.h"
+#include "pycore_state.h"
 #include "importdl.h"
 
 #include <sys/types.h>

diff --git a/Python/errors.c b/Python/errors.c
index 2926ea1918e68140c37eb542b826055041b9896f..14a70d9ce8e22647142cf14eec05573d0cdb022e 100644 (file)
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -2,7 +2,7 @@
 /* Error handling */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 
 #ifndef __STDC__
 #ifndef MS_WINDOWS

diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index 86af2b6f94c528e7b6c1f3960b5784e4f2c19dc7..9e906666586716e155f93f21cb043e1f294c5078 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 "internal/pystate.h"
+#include "pycore_state.h"
 #include <locale.h>
 
 #ifdef MS_WINDOWS

diff --git a/Python/getopt.c b/Python/getopt.c
index e8d7e523c2ea01ac8b96f6229d4f90e71c13b7b6..c165a94a2d84ca73d29522066db4a72743b1d0f6 100644 (file)
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-#include "internal/pygetopt.h"
+#include "pycore_getopt.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/Python/hamt.c b/Python/hamt.c
index 562f777ea0bf86837c5d240f05e9a30cda91994e..be3813b9aab175379a1caa3360221f5d757fe42c 100644 (file)
--- a/Python/hamt.c
+++ b/Python/hamt.c
@@ -1,8 +1,8 @@
 #include "Python.h"
 
 #include "structmember.h"
-#include "internal/pystate.h"
-#include "internal/hamt.h"
+#include "pycore_state.h"
+#include "pycore_hamt.h"
 
 /*
 This file provides an implemention of an immutable mapping using the

diff --git a/Python/import.c b/Python/import.c
index 338cd302dcc0ec770cd9882690ef4aacaac33230..18cd29df7e934d1fad86ec4879ecbe912c2fc442 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -4,9 +4,9 @@
 
 #include "Python-ast.h"
 #undef Yield /* undefine macro conflicting with winbase.h */
-#include "internal/hash.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_hash.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "errcode.h"
 #include "marshal.h"
 #include "code.h"

diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index efccb8d6bb8523982452ef58fbe17555c10176d7..04064159f86bc7a2d6d62d4d9d95616b7cf3a5c0 100644 (file)
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -2,8 +2,8 @@
 
 #include "Python.h"
 #include "osdefs.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include <wchar.h>
 
 #ifdef __cplusplus

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index fab96fd5238180852fe2d662f978faa941baf976..d349aaf6deca0b15ac1d52ee7fa2be0dfbf191ee 100644 (file)
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -4,10 +4,10 @@
 
 #include "Python-ast.h"
 #undef Yield /* undefine macro conflicting with winbase.h */
-#include "internal/context.h"
-#include "internal/hamt.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_context.h"
+#include "pycore_hamt.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "grammar.h"
 #include "node.h"
 #include "token.h"

diff --git a/Python/pystate.c b/Python/pystate.c
index 98e954d9d91db6995cebb7d5ceae44cbd6899dc2..c77902a7f9c775066f62edc82c76f14ebf5bf714 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 "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 
 #define _PyThreadState_SET(value) \
     _Py_atomic_store_relaxed(&_PyRuntime.gilstate.tstate_current, \

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 276c5d102858d35e90534a9531dbe60202da9307..2f61aab40d9053533eb0ed0c49a7c98aa6fc6733 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -12,7 +12,7 @@
 
 #include "Python-ast.h"
 #undef Yield /* undefine macro conflicting with winbase.h */
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #include "grammar.h"
 #include "node.h"
 #include "token.h"

diff --git a/Python/symtable.c b/Python/symtable.c
index dc934a556daa07a63ab03366f23562aeb3bc72b0..dae6fda0e4c736d1fcf3920bdb199c76b0c294a5 100644 (file)
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 #ifdef Yield
 #undef Yield /* undefine conflicting macro from winbase.h */
 #endif

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 71414c959789e5fa2ebaac86193d9804167824e5..cb13e21c9405b2d7122a76b2dbc4154340b1c7aa 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -15,8 +15,8 @@ Data members:
 */
 
 #include "Python.h"
-#include "internal/mem.h"
-#include "internal/pystate.h"
+#include "pycore_mem.h"
+#include "pycore_state.h"
 #include "code.h"
 #include "frameobject.h"
 #include "pythread.h"

diff --git a/Python/thread.c b/Python/thread.c
index a1e1fa64f1201f2b33e22ace41e27fd5b5e97a8d..63553816b350e3b76c809c6c8237d589d15a8673 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 "internal/pystate.h"
+#include "pycore_state.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 5b5c715a0f4499c748a46f072462fbd6080656cb..e2070f08a5a272dea628b2c2677d683da8f9cad0 100644 (file)
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -2,7 +2,7 @@
 /* Traceback implementation */
 
 #include "Python.h"
-#include "internal/pystate.h"
+#include "pycore_state.h"
 
 #include "code.h"
 #include "frameobject.h"