[Python-checkins] python/dist/src/Modules itertoolsmodule.c,1.17,1.18

2003年7月14日 00:07:15 -0700

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv1699
Modified Files:
	itertoolsmodule.c 
Log Message:
SF patch #770521: make itertools type declarations static
(Contributed by Andrew I MacIntyre.)
Index: itertoolsmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/itertoolsmodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** itertoolsmodule.c	18 Jun 2003 19:25:34 -0000	1.17
--- itertoolsmodule.c	14 Jul 2003 07:07:12 -0000	1.18
***************
*** 17,21 ****
 } cycleobject;

! PyTypeObject cycle_type;

 static PyObject *
--- 17,21 ----
 } cycleobject;

! static PyTypeObject cycle_type;

 static PyObject *
***************
*** 112,116 ****
 Then repeat the sequence indefinitely.");

! PyTypeObject cycle_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 112,116 ----
 Then repeat the sequence indefinitely.");

! static PyTypeObject cycle_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 167,171 ****
 } dropwhileobject;

! PyTypeObject dropwhile_type;

 static PyObject *
--- 167,171 ----
 } dropwhileobject;

! static PyTypeObject dropwhile_type;

 static PyObject *
***************
*** 261,265 ****
 Afterwards, return every element until the iterable is exhausted.");

! PyTypeObject dropwhile_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 261,265 ----
 Afterwards, return every element until the iterable is exhausted.");

! static PyTypeObject dropwhile_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 316,320 ****
 } takewhileobject;

! PyTypeObject takewhile_type;

 static PyObject *
--- 316,320 ----
 } takewhileobject;

! static PyTypeObject takewhile_type;

 static PyObject *
***************
*** 409,413 ****
 predicate evaluates to true for each entry.");

! PyTypeObject takewhile_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 409,413 ----
 predicate evaluates to true for each entry.");

! static PyTypeObject takewhile_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 466,470 ****
 } isliceobject;

! PyTypeObject islice_type;

 static PyObject *
--- 466,470 ----
 } isliceobject;

! static PyTypeObject islice_type;

 static PyObject *
***************
*** 599,603 ****
 but returns an iterator.");

! PyTypeObject islice_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 599,603 ----
 but returns an iterator.");

! static PyTypeObject islice_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 653,657 ****
 } starmapobject;

! PyTypeObject starmap_type;

 static PyObject *
--- 653,657 ----
 } starmapobject;

! static PyTypeObject starmap_type;

 static PyObject *
***************
*** 738,742 ****
 with a argument tuple taken from the given sequence.");

! PyTypeObject starmap_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 738,742 ----
 with a argument tuple taken from the given sequence.");

! static PyTypeObject starmap_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 792,796 ****
 } imapobject;

! PyTypeObject imap_type;

 static PyObject *
--- 792,796 ----
 } imapobject;

! static PyTypeObject imap_type;

 static PyObject *
***************
*** 925,929 ****
 iterables.");

! PyTypeObject imap_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 925,929 ----
 iterables.");

! static PyTypeObject imap_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 980,984 ****
 } chainobject;

! PyTypeObject chain_type;

 static PyObject *
--- 980,984 ----
 } chainobject;

! static PyTypeObject chain_type;

 static PyObject *
***************
*** 1062,1066 ****
 iterable, until all of the iterables are exhausted.");

! PyTypeObject chain_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 1062,1066 ----
 iterable, until all of the iterables are exhausted.");

! static PyTypeObject chain_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 1116,1120 ****
 } ifilterobject;

! PyTypeObject ifilter_type;

 static PyObject *
--- 1116,1120 ----
 } ifilterobject;

! static PyTypeObject ifilter_type;

 static PyObject *
***************
*** 1211,1215 ****
 If function is None, return the items that are true.");

! PyTypeObject ifilter_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 1211,1215 ----
 If function is None, return the items that are true.");

! static PyTypeObject ifilter_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 1265,1269 ****
 } ifilterfalseobject;

! PyTypeObject ifilterfalse_type;

 static PyObject *
--- 1265,1269 ----
 } ifilterfalseobject;

! static PyTypeObject ifilterfalse_type;

 static PyObject *
***************
*** 1360,1364 ****
 If function is None, return the items that are false.");

! PyTypeObject ifilterfalse_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 1360,1364 ----
 If function is None, return the items that are false.");

! static PyTypeObject ifilterfalse_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 1413,1417 ****
 } countobject;

! PyTypeObject count_type;

 static PyObject *
--- 1413,1417 ----
 } countobject;

! static PyTypeObject count_type;

 static PyObject *
***************
*** 1445,1449 ****
 integers starting from zero or, if specified, from firstval.");

! PyTypeObject count_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 1445,1449 ----
 integers starting from zero or, if specified, from firstval.");

! static PyTypeObject count_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 1500,1504 ****
 } izipobject;

! PyTypeObject izip_type;

 static PyObject *
--- 1500,1504 ----
 } izipobject;

! static PyTypeObject izip_type;

 static PyObject *
***************
*** 1638,1642 ****
 a list.");

! PyTypeObject izip_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 1638,1642 ----
 a list.");

! static PyTypeObject izip_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
***************
*** 1692,1696 ****
 } repeatobject;

! PyTypeObject repeat_type;

 static PyObject *
--- 1692,1696 ----
 } repeatobject;

! static PyTypeObject repeat_type;

 static PyObject *
***************
*** 1748,1752 ****
 endlessly.");

! PyTypeObject repeat_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
--- 1748,1752 ----
 endlessly.");

! static PyTypeObject repeat_type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */