[Python-checkins] r86883 - in python/branches/py3k: Include/Python.h Misc/NEWS Modules/_lsprof.c Modules/_struct.c Modules/grpmodule.c Modules/posixmodule.c Modules/pwdmodule.c Modules/resource.c Modules/spwdmodule.c Modules/timemodule.c Objects/floatobject.c Objects/longobject.c Objects/structseq.c Python/sysmodule.c

[georg.brandl]

Author: georg.brandl
Date: Tue Nov 30 10:30:54 2010
New Revision: 86883

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

Modified:
   python/branches/py3k/Include/Python.h
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/_lsprof.c
   python/branches/py3k/Modules/_struct.c
   python/branches/py3k/Modules/grpmodule.c
   python/branches/py3k/Modules/posixmodule.c
   python/branches/py3k/Modules/pwdmodule.c
   python/branches/py3k/Modules/resource.c
   python/branches/py3k/Modules/spwdmodule.c
   python/branches/py3k/Modules/timemodule.c
   python/branches/py3k/Objects/floatobject.c
   python/branches/py3k/Objects/longobject.c
   python/branches/py3k/Objects/structseq.c
   python/branches/py3k/Python/sysmodule.c

Modified: python/branches/py3k/Include/Python.h
==============================================================================
--- python/branches/py3k/Include/Python.h	(original)
+++ python/branches/py3k/Include/Python.h	Tue Nov 30 10:30:54 2010
@@ -98,6 +98,7 @@
 #include "descrobject.h"
 #include "warnings.h"
 #include "weakrefobject.h"
+#include "structseq.h"
 
 #include "codecs.h"
 #include "pyerrors.h"

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue Nov 30 10:30:54 2010
@@ -136,6 +136,8 @@
 C-API
 -----
 
+- structseq.h is now included in Python.h.
+
 - Loosen PyArg_ValidateKeywordArguments to allow dict subclasses.
 
 Tests

Modified: python/branches/py3k/Modules/_lsprof.c
==============================================================================
--- python/branches/py3k/Modules/_lsprof.c	(original)
+++ python/branches/py3k/Modules/_lsprof.c	Tue Nov 30 10:30:54 2010
@@ -1,7 +1,6 @@
 #include "Python.h"
 #include "compile.h"
 #include "frameobject.h"
-#include "structseq.h"
 #include "rotatingtree.h"
 
 #if !defined(HAVE_LONG_LONG)

Modified: python/branches/py3k/Modules/_struct.c
==============================================================================
--- python/branches/py3k/Modules/_struct.c	(original)
+++ python/branches/py3k/Modules/_struct.c	Tue Nov 30 10:30:54 2010
@@ -6,7 +6,6 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "structseq.h"
 #include "structmember.h"
 #include <ctype.h>
 

Modified: python/branches/py3k/Modules/grpmodule.c
==============================================================================
--- python/branches/py3k/Modules/grpmodule.c	(original)
+++ python/branches/py3k/Modules/grpmodule.c	Tue Nov 30 10:30:54 2010
@@ -2,7 +2,6 @@
 /* UNIX group file access module */
 
 #include "Python.h"
-#include "structseq.h"
 
 #include <sys/types.h>
 #include <grp.h>

Modified: python/branches/py3k/Modules/posixmodule.c
==============================================================================
--- python/branches/py3k/Modules/posixmodule.c	(original)
+++ python/branches/py3k/Modules/posixmodule.c	Tue Nov 30 10:30:54 2010
@@ -28,7 +28,6 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "structseq.h"
 
 #if defined(__VMS)
 #    include <unixio.h>

Modified: python/branches/py3k/Modules/pwdmodule.c
==============================================================================
--- python/branches/py3k/Modules/pwdmodule.c	(original)
+++ python/branches/py3k/Modules/pwdmodule.c	Tue Nov 30 10:30:54 2010
@@ -2,7 +2,6 @@
 /* UNIX password file access module */
 
 #include "Python.h"
-#include "structseq.h"
 
 #include <sys/types.h>
 #include <pwd.h>

Modified: python/branches/py3k/Modules/resource.c
==============================================================================
--- python/branches/py3k/Modules/resource.c	(original)
+++ python/branches/py3k/Modules/resource.c	Tue Nov 30 10:30:54 2010
@@ -1,6 +1,5 @@
 
 #include "Python.h"
-#include "structseq.h"
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <string.h>

Modified: python/branches/py3k/Modules/spwdmodule.c
==============================================================================
--- python/branches/py3k/Modules/spwdmodule.c	(original)
+++ python/branches/py3k/Modules/spwdmodule.c	Tue Nov 30 10:30:54 2010
@@ -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

Modified: python/branches/py3k/Modules/timemodule.c
==============================================================================
--- python/branches/py3k/Modules/timemodule.c	(original)
+++ python/branches/py3k/Modules/timemodule.c	Tue Nov 30 10:30:54 2010
@@ -2,7 +2,6 @@
 /* Time module */
 
 #include "Python.h"
-#include "structseq.h"
 #include "_time.h"
 
 #define TZNAME_ENCODING "utf-8"

Modified: python/branches/py3k/Objects/floatobject.c
==============================================================================
--- python/branches/py3k/Objects/floatobject.c	(original)
+++ python/branches/py3k/Objects/floatobject.c	Tue Nov 30 10:30:54 2010
@@ -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>

Modified: python/branches/py3k/Objects/longobject.c
==============================================================================
--- python/branches/py3k/Objects/longobject.c	(original)
+++ python/branches/py3k/Objects/longobject.c	Tue Nov 30 10:30:54 2010
@@ -4,7 +4,6 @@
 
 #include "Python.h"
 #include "longintrepr.h"
-#include "structseq.h"
 
 #include <float.h>
 #include <ctype.h>

Modified: python/branches/py3k/Objects/structseq.c
==============================================================================
--- python/branches/py3k/Objects/structseq.c	(original)
+++ python/branches/py3k/Objects/structseq.c	Tue Nov 30 10:30:54 2010
@@ -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";

Modified: python/branches/py3k/Python/sysmodule.c
==============================================================================
--- python/branches/py3k/Python/sysmodule.c	(original)
+++ python/branches/py3k/Python/sysmodule.c	Tue Nov 30 10:30:54 2010
@@ -15,7 +15,6 @@
 */
 
 #include "Python.h"
-#include "structseq.h"
 #include "code.h"
 #include "frameobject.h"
 #include "eval.h"