From d9ea5cae1d07e1ee8b03540a9367c26205e0e360 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 15 Apr 2020 02:57:50 +0200 Subject: [PATCH] bpo-40268: Remove unused pycore_pymem.h includes (GH-19531) --- Modules/_functoolsmodule.c | 1 - Modules/gcmodule.c | 1 - Modules/main.c | 1 - Objects/bytearrayobject.c | 1 - Objects/bytesobject.c | 4 ++-- Objects/cellobject.c | 1 - Objects/classobject.c | 1 - Objects/exceptions.c | 1 - Objects/funcobject.c | 1 - Objects/iterobject.c | 1 - Objects/memoryobject.c | 1 - Objects/methodobject.c | 1 - Objects/obmalloc.c | 2 +- Objects/sliceobject.c | 1 - Python/import.c | 2 +- Python/initconfig.c | 2 +- Python/pathconfig.c | 2 +- Python/preconfig.c | 6 +++--- Python/pylifecycle.c | 1 - Python/pystate.c | 2 +- Python/sysmodule.c | 6 +++--- 21 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index 90e388c1c635c6..78706b6ec3c4c1 100644 --- 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 d2cd2c92966162..5727820f09bbbc 100644 --- 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 fa9c6b4eb94188..4d696a35901361 100644 --- 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 f05a98acba043b..b271e57abb6866 100644 --- 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 30bc739ceea7f4..06ead2b58f980f 100644 --- 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 diff --git a/Objects/cellobject.c b/Objects/cellobject.c index 6efae626bf5b7d..86a89f02e60d3c 100644 --- 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 242a6428b8ef27..fd9f8757f84ab4 100644 --- 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 db1ff329ac143d..69a6b5c284dfae 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -8,7 +8,6 @@ #include #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 750c7aea0dfd6b..bd24f67b9740af 100644 --- 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 51104fbe9695fd..6cac41ad539db1 100644 --- 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 4340f0675f163f..682bbe8a61e85e 100644 --- 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 diff --git a/Objects/methodobject.c b/Objects/methodobject.c index f4836713162250..20eba6fa8643bf 100644 --- 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 3f6f9cf9ca4a49..eb34f10bddf993 100644 --- 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 diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c index 6093b3bd1534df..391711f711aae0 100644 --- 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 2f2e9d17061bfb..a2aa4afa18a728 100644 --- 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 201d930f7d8d20..32aafdb57addf5 100644 --- 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 // setlocale() #ifdef HAVE_LANGINFO_H diff --git a/Python/pathconfig.c b/Python/pathconfig.c index 1515926531a1cf..6ebfdac3fd2d38 100644 --- 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 #ifdef MS_WINDOWS # include // GetFullPathNameW(), MAX_PATH diff --git a/Python/preconfig.c b/Python/preconfig.c index 531d8d0df35044..1cbfccfe69ce1c 100644 --- 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 // setlocale() +#include "pycore_pymem.h" // _PyMem_GetAllocatorName() +#include "pycore_runtime.h" // _PyRuntime_Initialize() +#include // setlocale() #define DECODE_LOCALE_ERR(NAME, LEN) \ diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 974b425712cc83..9c13274dac04dd 100644 --- 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 d25fb3a2a626e1..84a694b32e5d0f 100644 --- 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 63111d58ab2e11..4e67325318aaf5 100644 --- 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"