bpo-40268: Remove unused pycore_pymem.h includes (GH-19531)

diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index 90e388c1c635c650c09af3737ec637a6c4603211..78706b6ec3c4c1c3f89d8978f956bef0b995fe11 100644 (file)
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -1,5 +1,4 @@
 #include "Python.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_tupleobject.h"
 #include "structmember.h"         // PyMemberDef

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index d2cd2c929661627e081312a7444390e76757fc43..5727820f09bbbcf2882e333b5a35ee0e3ac9b6f6 100644 (file)
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -30,7 +30,6 @@
 #include "pycore_object.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pystate.h"     // _PyThreadState_GET()
-#include "pycore_pymem.h"
 #include "frameobject.h"        // PyFrame_ClearFreeList
 #include "pydtrace.h"
 #include "pytime.h"             // _PyTime_GetMonotonicClock()

diff --git a/Modules/main.c b/Modules/main.c
index fa9c6b4eb9418860e739a724eb5022d749d79e76..4d696a359013614b213b3653c95c5a4c451e6e48 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -5,7 +5,6 @@
 #include "pycore_interp.h"       // _PyInterpreterState.sysdict
 #include "pycore_pathconfig.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"      // _PyInterpreterState_GET()
 
 /* Includes for exit_sigint() */

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index f05a98acba043b7ffa588b9edf00a3ec483a5940..b271e57abb686635b4c59217a730c4fa816a53f8 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -5,7 +5,6 @@
 #include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_bytes_methods.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "bytesobject.h"
 #include "pystrhex.h"
 

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 30bc739ceea7f4c79c8020cbdd7d1da2af2931fb..06ead2b58f980f9212b869458f744c0ccd2b1b89 100644 (file)
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -3,10 +3,10 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "pycore_abstract.h"   // _PyIndex_Check()
+#include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_bytes_methods.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // PYMEM_CLEANBYTE
 
 #include "pystrhex.h"
 #include <stddef.h>

diff --git a/Objects/cellobject.c b/Objects/cellobject.c
index 6efae626bf5b7d2b363e5584d1c36aec335cedb1..86a89f02e60d3c55e8ac784e918bf541f5b6fe6a 100644 (file)
--- a/Objects/cellobject.c
+++ b/Objects/cellobject.c
@@ -2,7 +2,6 @@
 
 #include "Python.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 
 PyObject *
 PyCell_New(PyObject *obj)

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 242a6428b8ef275e557fb46675b2ec5de74bfbf2..fd9f8757f84ab41d8a8199f66811fb5221158851 100644 (file)
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -3,7 +3,6 @@
 #include "Python.h"
 #include "pycore_object.h"
 #include "pycore_pyerrors.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "structmember.h"         // PyMemberDef
 

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index db1ff329ac143d6ff62aafc115b43c67d809c233..69a6b5c284dfaed4749118daa4eda16f7c22ee7f 100644 (file)
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -8,7 +8,6 @@
 #include <Python.h>
 #include "pycore_initconfig.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "structmember.h"         // PyMemberDef
 #include "osdefs.h"
 

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 750c7aea0dfd6b0e3b608554d6d8b37d138dc7dc..bd24f67b9740af2a696ac5c57f3e2d0c7a066a97 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -3,7 +3,6 @@
 
 #include "Python.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "pycore_tupleobject.h"
 #include "code.h"
 #include "structmember.h"         // PyMemberDef

diff --git a/Objects/iterobject.c b/Objects/iterobject.c
index 51104fbe9695fdfd055e9e93189222da401e66ef..6cac41ad539db121e3722ff4c1fc7f17584b9c61 100644 (file)
--- a/Objects/iterobject.c
+++ b/Objects/iterobject.c
@@ -2,7 +2,6 @@
 
 #include "Python.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 
 typedef struct {
     PyObject_HEAD

diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 4340f0675f163f2edf673b790481ade1a94d9caa..682bbe8a61e85e0ba190db2c1c75ba86c7190e1c 100644 (file)
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -13,7 +13,6 @@
 #include "Python.h"
 #include "pycore_abstract.h"   // _PyIndex_Check()
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "pystrhex.h"
 #include <stddef.h>
 

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index f4836713162250b4040073a36742558137fefef7..20eba6fa8643bfc2adb715d2ffe7f660182ad703 100644 (file)
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -5,7 +5,6 @@
 #include "pycore_ceval.h"         // _Py_EnterRecursiveCall()
 #include "pycore_object.h"
 #include "pycore_pyerrors.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "structmember.h"         // PyMemberDef
 

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 3f6f9cf9ca4a4955e21444ddd7e9953220c535b1..eb34f10bddf993a45169563d220d97d238cb63c8 100644 (file)
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyTraceMalloc_Config
 
 #include <stdbool.h>
 

diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index 6093b3bd1534dfde8f18d4d8df5b0073c21df834..391711f711aae0481ea126b85b55e2f89a1b364b 100644 (file)
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -16,7 +16,6 @@ this type and there is exactly one in existence.
 #include "Python.h"
 #include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "structmember.h"         // PyMemberDef
 
 static PyObject *

diff --git a/Python/import.c b/Python/import.c
index 2f2e9d17061bfb990693108a17404b082ea28be4..a2aa4afa18a72899c4244ede2d4fba08ff102f92 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -8,7 +8,7 @@
 #include "pycore_pyerrors.h"
 #include "pycore_pyhash.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include "pycore_interp.h"        // _PyInterpreterState_ClearModules()
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
 #include "pycore_sysmodule.h"

diff --git a/Python/initconfig.c b/Python/initconfig.c
index 201d930f7d8d20c96ad483b0c1efef59dcc3ddc7..32aafdb57addf5718a93d41248bdfc5d2db92194 100644 (file)
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -7,7 +7,7 @@
 #include "pycore_pathconfig.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include <locale.h>               // setlocale()
 #ifdef HAVE_LANGINFO_H

diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index 1515926531a1cfcbe642be873101e9301e98efe6..6ebfdac3fd2d38a7a171e071d209b8eed44a8ff1 100644 (file)
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -5,7 +5,7 @@
 #include "pycore_initconfig.h"
 #include "pycore_fileutils.h"
 #include "pycore_pathconfig.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include <wchar.h>
 #ifdef MS_WINDOWS
 #  include <windows.h>            // GetFullPathNameW(), MAX_PATH

diff --git a/Python/preconfig.c b/Python/preconfig.c
index 531d8d0df350446285e85baca2fe187678a9bee2..1cbfccfe69ce1cfbc605e54f06e3c513dc3e5c7e 100644 (file)
--- a/Python/preconfig.c
+++ b/Python/preconfig.c
@@ -1,9 +1,9 @@
 #include "Python.h"
 #include "pycore_getopt.h"
 #include "pycore_initconfig.h"
-#include "pycore_pymem.h"      // _PyMem_GetAllocatorName()
-#include "pycore_runtime.h"    // _PyRuntime_Initialize()
-#include <locale.h>            // setlocale()
+#include "pycore_pymem.h"         // _PyMem_GetAllocatorName()
+#include "pycore_runtime.h"       // _PyRuntime_Initialize()
+#include <locale.h>               // setlocale()
 
 
 #define DECODE_LOCALE_ERR(NAME, LEN) \

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 974b425712cc83e01998bfa020040a89c57ece24..9c13274dac04dd85bccc47cd41b0dbf7ca4eb475 100644 (file)
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -14,7 +14,6 @@
 #include "pycore_pathconfig.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_sysmodule.h"
 #include "pycore_traceback.h"

diff --git a/Python/pystate.c b/Python/pystate.c
index d25fb3a2a626e1f5adcf0ff14711001598e448fb..84a694b32e5d0f7e2730eb276d3cb90f498eef3b 100644 (file)
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -6,7 +6,7 @@
 #include "pycore_initconfig.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_sysmodule.h"
 

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 63111d58ab2e111ce276a899fe77667b5a741302..4e67325318aaf577bcc7ba0cef2b65d0c6bcfaee 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -17,14 +17,14 @@ Data members:
 #include "Python.h"
 #include "code.h"
 #include "frameobject.h"
-#include "pycore_ceval.h"        // _Py_RecursionLimitLowerWaterMark()
+#include "pycore_ceval.h"         // _Py_RecursionLimitLowerWaterMark()
 #include "pycore_initconfig.h"
 #include "pycore_object.h"
 #include "pycore_pathconfig.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
-#include "pycore_pystate.h"      // _PyThreadState_GET()
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
+#include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_tupleobject.h"
 #include "pydtrace.h"