From e5b99f0fb306b80118849048b3d145c1a614c38b Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 30 Nov 2010 09:41:01 +0000 Subject: Remove redundant includes of headers that are already included by Python.h. --- Modules/_datetimemodule.c | 1 - Modules/_lsprof.c | 1 - Modules/main.c | 1 - Modules/parsermodule.c | 2 -- Modules/signalmodule.c | 1 - Modules/symtablemodule.c | 1 - Objects/funcobject.c | 1 - Objects/genobject.c | 2 -- Objects/object.c | 1 - Objects/unicodectype.c | 1 - Objects/unicodeobject.c | 1 - Python/ast.c | 1 - Python/bltinmodule.c | 1 - Python/ceval.c | 1 - Python/compile.c | 2 -- Python/future.c | 1 - Python/import.c | 4 ---- Python/peephole.c | 2 -- Python/pyarena.c | 1 - Python/pythonrun.c | 4 ---- Python/sysmodule.c | 1 - Python/traceback.c | 1 - 22 files changed, 32 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index d791cde..32fe835 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -3,7 +3,6 @@ */ #include "Python.h" -#include "modsupport.h" #include "structmember.h" #include diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c index a5630c8..048cfc8 100644 --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -1,5 +1,4 @@ #include "Python.h" -#include "compile.h" #include "frameobject.h" #include "rotatingtree.h" diff --git a/Modules/main.c b/Modules/main.c index 590104d..eeb94c8 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -2,7 +2,6 @@ #include "Python.h" #include "osdefs.h" -#include "import.h" #include diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 8c57f86..27b680f 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -34,10 +34,8 @@ #include "grammar.h" #include "parsetok.h" /* ISTERMINAL() / ISNONTERMINAL() */ -#include "compile.h" #undef Yield #include "ast.h" -#include "pyarena.h" extern grammar _PyParser_Grammar; /* From graminit.c */ diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 0e7fd65..a93caad 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -4,7 +4,6 @@ /* XXX Signals should be recorded per thread, now we have thread state. */ #include "Python.h" -#include "intrcheck.h" #ifdef MS_WINDOWS #include diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c index 3f281d2..f6201e5 100644 --- a/Modules/symtablemodule.c +++ b/Modules/symtablemodule.c @@ -1,7 +1,6 @@ #include "Python.h" #include "code.h" -#include "compile.h" #include "Python-ast.h" #include "symtable.h" diff --git a/Objects/funcobject.c b/Objects/funcobject.c index c2ad964..221f368 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -3,7 +3,6 @@ #include "Python.h" #include "code.h" -#include "eval.h" #include "structmember.h" PyObject * diff --git a/Objects/genobject.c b/Objects/genobject.c index 34ee7dc..3fa1b4e 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -2,8 +2,6 @@ #include "Python.h" #include "frameobject.h" -#include "genobject.h" -#include "ceval.h" #include "structmember.h" #include "opcode.h" diff --git a/Objects/object.c b/Objects/object.c index 723e40e..082dd78 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -2,7 +2,6 @@ /* Generic object operations; and implementation of None (NoObject) */ #include "Python.h" -#include "sliceobject.h" /* For PyEllipsis_Type */ #include "frameobject.h" #ifdef __cplusplus diff --git a/Objects/unicodectype.c b/Objects/unicodectype.c index a41ceb8..9f6ac89 100644 --- a/Objects/unicodectype.c +++ b/Objects/unicodectype.c @@ -9,7 +9,6 @@ */ #include "Python.h" -#include "unicodeobject.h" #define ALPHA_MASK 0x01 #define DECIMAL_MASK 0x02 diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index d6cc8b5..89e3c8a 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -43,7 +43,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "Python.h" #include "bytes_methods.h" -#include "unicodeobject.h" #include "ucnhash.h" #ifdef MS_WINDOWS diff --git a/Python/ast.c b/Python/ast.c index d1aa616..4edf335 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -7,7 +7,6 @@ #include "Python-ast.h" #include "grammar.h" #include "node.h" -#include "pyarena.h" #include "ast.h" #include "token.h" #include "parsetok.h" diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index f374277..f300ab2 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -5,7 +5,6 @@ #include "node.h" #include "code.h" -#include "eval.h" #include diff --git a/Python/ceval.c b/Python/ceval.c index 1eb5f62..140112f 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -13,7 +13,6 @@ #include "code.h" #include "frameobject.h" -#include "eval.h" #include "opcode.h" #include "structmember.h" diff --git a/Python/compile.c b/Python/compile.c index fb27596..dfb2c9b 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -25,10 +25,8 @@ #include "Python-ast.h" #include "node.h" -#include "pyarena.h" #include "ast.h" #include "code.h" -#include "compile.h" #include "symtable.h" #include "opcode.h" diff --git a/Python/future.c b/Python/future.c index 551edc6..d6b653f 100644 --- a/Python/future.c +++ b/Python/future.c @@ -4,7 +4,6 @@ #include "token.h" #include "graminit.h" #include "code.h" -#include "compile.h" #include "symtable.h" #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined" diff --git a/Python/import.c b/Python/import.c index 85ead86..67c4f70 100644 --- a/Python/import.c +++ b/Python/import.c @@ -5,13 +5,9 @@ #include "Python-ast.h" #undef Yield /* undefine macro conflicting with winbase.h */ -#include "pyarena.h" -#include "pythonrun.h" #include "errcode.h" #include "marshal.h" #include "code.h" -#include "compile.h" -#include "eval.h" #include "osdefs.h" #include "importdl.h" diff --git a/Python/peephole.c b/Python/peephole.c index 9d06963..f972e16 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -4,10 +4,8 @@ #include "Python-ast.h" #include "node.h" -#include "pyarena.h" #include "ast.h" #include "code.h" -#include "compile.h" #include "symtable.h" #include "opcode.h" diff --git a/Python/pyarena.c b/Python/pyarena.c index 2d63638..5a255ae 100644 --- a/Python/pyarena.c +++ b/Python/pyarena.c @@ -1,5 +1,4 @@ #include "Python.h" -#include "pyarena.h" /* A simple arena block structure. diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 37c1f11..de8e9da 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -11,14 +11,10 @@ #include "parsetok.h" #include "errcode.h" #include "code.h" -#include "compile.h" #include "symtable.h" -#include "pyarena.h" #include "ast.h" -#include "eval.h" #include "marshal.h" #include "osdefs.h" -#include "abstract.h" #ifdef HAVE_SIGNAL_H #include diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 1aa4271..204c8c8 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -17,7 +17,6 @@ Data members: #include "Python.h" #include "code.h" #include "frameobject.h" -#include "eval.h" #include "osdefs.h" diff --git a/Python/traceback.c b/Python/traceback.c index ab10cfd..59bb3f0 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -7,7 +7,6 @@ #include "frameobject.h" #include "structmember.h" #include "osdefs.h" -#include "traceback.h" #ifdef HAVE_FCNTL_H #include #endif -- cgit v0.12