Include structseq.h in Python.h, and remove now-redundant includes in individual...

diff --git a/Include/Python.h b/Include/Python.h
index 6ca7a58b206215d9bcc887934a35a2f084dc0baf..a49753ff297094c704a0dc477d3122869af3ffbe 100644 (file)
--- 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 f39b2e2d9061392701cfabb0beb75b4ddba963c6..2eb41df39cfb984b663f812fce9a351e1abe9049 100644 (file)
--- 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 1fd660badf0121e4fee994bb65d071a8b34346b4..a5630c8cdb6e1853c66c8fb29fff38be6e08e357 100644 (file)
--- 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 f85d5622d7b5009af96f979976fdc9fd30d6d06c..2b4341ce2f682f8b2af9472219583ca2e718d4fc 100644 (file)
--- 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 <ctype.h>
 

diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
index d64c14285734c175faa40cc51c5158620afab38d..97a3783bc86c372cf47892074e2f9b1554eae60c 100644 (file)
--- a/Modules/grpmodule.c
+++ b/Modules/grpmodule.c
@@ -2,7 +2,6 @@
 /* UNIX group file access module */
 
 #include "Python.h"
-#include "structseq.h"
 
 #include <sys/types.h>
 #include <grp.h>

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 48dbaa515c41937644b952df76a05771f6bd5502..7267eca1bac0078e103607b425e20981ec985075 100644 (file)
--- 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 <unixio.h>

diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index 4e6bd2facfc8e7ac34ea8f6766881d237489df05..1e0903a3887c74fb2b11c8eafd485d7ba9f49592 100644 (file)
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -2,7 +2,6 @@
 /* UNIX password file access module */
 
 #include "Python.h"
-#include "structseq.h"
 
 #include <sys/types.h>
 #include <pwd.h>

diff --git a/Modules/resource.c b/Modules/resource.c
index 450f08ccc6bec2fbaefc55570fe6fac6ab8c9a6e..1875e483f9b931344d17f834994874ccb69b37a7 100644 (file)
--- a/Modules/resource.c
+++ b/Modules/resource.c
@@ -1,6 +1,5 @@
 
 #include "Python.h"
-#include "structseq.h"
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <string.h>

diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c
index 96707b4ada829e7c78e8d10cf0599fa62671a723..194ae196ba7c515b8445c8b223662909fea0aad5 100644 (file)
--- 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 <sys/types.h>
 #ifdef HAVE_SHADOW_H

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 5e6cd6c91b42717964f5f822b3c3e4476a9e38e8..79803f4a01da5ca78ce8b368d96f2dce72f291d1 100644 (file)
--- 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 d0173e8d1340c1b8eee9dc52d8b2a0212cd78b21..4decb0b6278d70d67c893829ee4937707b7343f1 100644 (file)
--- 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 <ctype.h>
 #include <float.h>

diff --git a/Objects/longobject.c b/Objects/longobject.c
index b9ce38808f55b8085f1b96b8042a3fe9b3ae5904..e8a728489b605621fcae31c090bdf459761c9f36 100644 (file)
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -4,7 +4,6 @@
 
 #include "Python.h"
 #include "longintrepr.h"
-#include "structseq.h"
 
 #include <float.h>
 #include <ctype.h>

diff --git a/Objects/structseq.c b/Objects/structseq.c
index 52ff301ff6dd5e4ae86be58f1c51c3b63d9f1e61..75e2250bf9c0342d67d2f30c45827b0a2f9d24b0 100644 (file)
--- 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 876e31e8308ece2a78042b20ff823e2b0cc0f69d..1aa4271d76c03ee077fb8eb4f32e68112607ffb7 100644 (file)
--- 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"