From: Georg Brandl Date: Tue, 30 Nov 2010 09:30:54 +0000 (+0000) Subject: Include structseq.h in Python.h, and remove now-redundant includes in individual... X-Git-Tag: v3.2b1~166 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71c23d447322307572fbe0ca68b61fad97e10021;p=python Include structseq.h in Python.h, and remove now-redundant includes in individual sources. --- diff --git a/Include/Python.h b/Include/Python.h index 6ca7a58b20..a49753ff29 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -98,6 +98,7 @@ #include "descrobject.h" #include "warnings.h" #include "weakrefobject.h" +#include "structseq.h" #include "codecs.h" #include "pyerrors.h" diff --git a/Misc/NEWS b/Misc/NEWS index f39b2e2d90..2eb41df39c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -136,6 +136,8 @@ Library C-API ----- +- structseq.h is now included in Python.h. + - Loosen PyArg_ValidateKeywordArguments to allow dict subclasses. Tests diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c index 1fd660badf..a5630c8cdb 100644 --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -1,7 +1,6 @@ #include "Python.h" #include "compile.h" #include "frameobject.h" -#include "structseq.h" #include "rotatingtree.h" #if !defined(HAVE_LONG_LONG) diff --git a/Modules/_struct.c b/Modules/_struct.c index f85d5622d7..2b4341ce2f 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -6,7 +6,6 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "structseq.h" #include "structmember.h" #include diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c index d64c142857..97a3783bc8 100644 --- a/Modules/grpmodule.c +++ b/Modules/grpmodule.c @@ -2,7 +2,6 @@ /* UNIX group file access module */ #include "Python.h" -#include "structseq.h" #include #include diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 48dbaa515c..7267eca1ba 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -28,7 +28,6 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "structseq.h" #if defined(__VMS) # include diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c index 4e6bd2facf..1e0903a388 100644 --- a/Modules/pwdmodule.c +++ b/Modules/pwdmodule.c @@ -2,7 +2,6 @@ /* UNIX password file access module */ #include "Python.h" -#include "structseq.h" #include #include diff --git a/Modules/resource.c b/Modules/resource.c index 450f08ccc6..1875e483f9 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -1,6 +1,5 @@ #include "Python.h" -#include "structseq.h" #include #include #include diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c index 96707b4ada..194ae196ba 100644 --- a/Modules/spwdmodule.c +++ b/Modules/spwdmodule.c @@ -4,7 +4,6 @@ /* For info also see http://www.unixpapa.com/incnote/passwd.html */ #include "Python.h" -#include "structseq.h" #include #ifdef HAVE_SHADOW_H diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 5e6cd6c91b..79803f4a01 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -2,7 +2,6 @@ /* Time module */ #include "Python.h" -#include "structseq.h" #include "_time.h" #define TZNAME_ENCODING "utf-8" diff --git a/Objects/floatobject.c b/Objects/floatobject.c index d0173e8d13..4decb0b627 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -5,7 +5,6 @@ for any kind of float exception without losing portability. */ #include "Python.h" -#include "structseq.h" #include #include diff --git a/Objects/longobject.c b/Objects/longobject.c index b9ce38808f..e8a728489b 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -4,7 +4,6 @@ #include "Python.h" #include "longintrepr.h" -#include "structseq.h" #include #include diff --git a/Objects/structseq.c b/Objects/structseq.c index 52ff301ff6..75e2250bf9 100644 --- a/Objects/structseq.c +++ b/Objects/structseq.c @@ -3,7 +3,6 @@ #include "Python.h" #include "structmember.h" -#include "structseq.h" static char visible_length_key[] = "n_sequence_fields"; static char real_length_key[] = "n_fields"; diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 876e31e830..1aa4271d76 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -15,7 +15,6 @@ Data members: */ #include "Python.h" -#include "structseq.h" #include "code.h" #include "frameobject.h" #include "eval.h"