diff --git a/Include/Python.h b/Include/Python.h index 6ca7a58b206..a49753ff297 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 f39b2e2d906..2eb41df39cf 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 1fd660badf0..a5630c8cdb6 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 f85d5622d7b..2b4341ce2f6 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 d64c1428573..97a3783bc86 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 48dbaa515c4..7267eca1bac 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 4e6bd2facfc..1e0903a3887 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 450f08ccc6b..1875e483f9b 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 96707b4ada8..194ae196ba7 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 5e6cd6c91b4..79803f4a01d 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 d0173e8d134..4decb0b6278 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 b9ce38808f5..e8a728489b6 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 52ff301ff6d..75e2250bf9c 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 876e31e8308..1aa4271d76c 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"