Mailman 3 March 2004 - Python-checkins

python/dist/src/Lib/test test_time.py, 1.15, 1.16 test_strftime.py, 1.27, 1.28
by bcannon＠users.sourceforge.net 01 Mar '04

01 Mar '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29826/Lib/test Modified Files: test_time.py test_strftime.py Log Message: Have strftime() check its time tuple argument to make sure the tuple's values are within proper boundaries as specified in the docs. This can break possible code (datetime module needed changing, for instance) that uses 0 for values that need to be greater 1 or greater (month, day, and day of year). Fixes bug #897625. Index: test_time.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_time.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** test_time.py 24 Apr 2003 16:02:53 -0000 1.15 --- test_time.py 2 Mar 2004 04:38:10 -0000 1.16 *************** *** 38,41 **** --- 38,97 ---- self.fail('conversion specifier: %r failed.' % format) + def test_strftime_bounds_checking(self): + # Make sure that strftime() checks the bounds of the various parts + #of the time tuple. + + # Check year + self.assertRaises(ValueError, time.strftime, '', + (1899, 1, 1, 0, 0, 0, 0, 1, -1)) + if time.accept2dyear: + self.assertRaises(ValueError, time.strftime, '', + (-1, 1, 1, 0, 0, 0, 0, 1, -1)) + self.assertRaises(ValueError, time.strftime, '', + (100, 1, 1, 0, 0, 0, 0, 1, -1)) + # Check month + self.assertRaises(ValueError, time.strftime, '', + (1900, 0, 1, 0, 0, 0, 0, 1, -1)) + self.assertRaises(ValueError, time.strftime, '', + (1900, 13, 1, 0, 0, 0, 0, 1, -1)) + # Check day of month + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 0, 0, 0, 0, 0, 1, -1)) + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 32, 0, 0, 0, 0, 1, -1)) + # Check hour + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, -1, 0, 0, 0, 1, -1)) + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 24, 0, 0, 0, 1, -1)) + # Check minute + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, -1, 0, 0, 1, -1)) + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, 60, 0, 0, 1, -1)) + # Check second + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, 0, -1, 0, 1, -1)) + # C99 only requires allowing for one leap second, but Python's docs say + # allow two leap seconds (0..61) + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, 0, 62, 0, 1, -1)) + # No check for upper-bound day of week; + # value forced into range by a ``% 7`` calculation. + # Start check at -2 since gettmarg() increments value before taking + # modulo. + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, 0, 0, -2, 1, -1)) + # Check day of the year + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, 0, 0, 0, 0, -1)) + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, 0, 0, 0, 367, -1)) + # Check daylight savings flag + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, 0, 0, 0, 1, -2)) + self.assertRaises(ValueError, time.strftime, '', + (1900, 1, 1, 0, 0, 0, 0, 1, 2)) + def test_strptime(self): tt = time.gmtime(self.t) Index: test_strftime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strftime.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** test_strftime.py 23 Jul 2002 19:04:03 -0000 1.27 --- test_strftime.py 2 Mar 2004 04:38:10 -0000 1.28 *************** *** 39,43 **** else: ampm='(PM|pm)' ! jan1 = time.localtime(time.mktime((now[0], 1, 1) + (0,)*6)) try: --- 39,43 ---- else: ampm='(PM|pm)' ! jan1 = time.localtime(time.mktime((now[0], 1, 1, 0, 0, 0, 0, 1, 0))) try:

1 0

python/dist/src/Modules timemodule.c, 2.139, 2.140 datetimemodule.c, 1.69, 1.70
by bcannon＠users.sourceforge.net 01 Mar '04

01 Mar '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29826/Modules Modified Files: timemodule.c datetimemodule.c Log Message: Have strftime() check its time tuple argument to make sure the tuple's values are within proper boundaries as specified in the docs. This can break possible code (datetime module needed changing, for instance) that uses 0 for values that need to be greater 1 or greater (month, day, and day of year). Fixes bug #897625. Index: timemodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v retrieving revision 2.139 retrieving revision 2.140 diff -C2 -d -r2.139 -r2.140 *** timemodule.c 20 Nov 2003 01:44:59 -0000 2.139 --- timemodule.c 2 Mar 2004 04:38:10 -0000 2.140 *************** *** 347,350 **** --- 347,392 ---- return NULL; + /* Checks added to make sure strftime() does not crash Python by + indexing blindly into some array for a textual representation + by some bad index (fixes bug #897625). + + No check for year since handled in gettmarg(). + */ + if (buf.tm_mon < 0 || buf.tm_mon > 11) { + PyErr_SetString(PyExc_ValueError, "month out of range"); + return NULL; + } + if (buf.tm_mday < 1 || buf.tm_mday > 31) { + PyErr_SetString(PyExc_ValueError, "day of month out of range"); + return NULL; + } + if (buf.tm_hour < 0 || buf.tm_hour > 23) { + PyErr_SetString(PyExc_ValueError, "hour out of range"); + return NULL; + } + if (buf.tm_min < 0 || buf.tm_min > 59) { + PyErr_SetString(PyExc_ValueError, "minute out of range"); + return NULL; + } + if (buf.tm_sec < 0 || buf.tm_sec > 61) { + PyErr_SetString(PyExc_ValueError, "seconds out of range"); + return NULL; + } + /* tm_wday does not need checking of its upper-bound since taking + ``% 7`` in gettmarg() automatically restricts the range. */ + if (buf.tm_wday < 0) { + PyErr_SetString(PyExc_ValueError, "day of week out of range"); + return NULL; + } + if (buf.tm_yday < 0 || buf.tm_yday > 365) { + PyErr_SetString(PyExc_ValueError, "day of year out of range"); + return NULL; + } + if (buf.tm_isdst < -1 || buf.tm_isdst > 1) { + PyErr_SetString(PyExc_ValueError, + "daylight savings flag out of range"); + return NULL; + } + fmtlen = strlen(fmt); Index: datetimemodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/datetimemodule.c,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** datetimemodule.c 20 Oct 2003 14:01:53 -0000 1.69 --- datetimemodule.c 2 Mar 2004 04:38:10 -0000 1.70 *************** *** 3190,3198 **** */ tuple = Py_BuildValue("iiiiiiiii", ! 1900, 0, 0, /* year, month, day */ TIME_GET_HOUR(self), TIME_GET_MINUTE(self), TIME_GET_SECOND(self), ! 0, 0, -1); /* weekday, daynum, dst */ if (tuple == NULL) return NULL; --- 3190,3198 ---- */ tuple = Py_BuildValue("iiiiiiiii", ! 1900, 1, 1, /* year, month, day */ TIME_GET_HOUR(self), TIME_GET_MINUTE(self), TIME_GET_SECOND(self), ! 0, 1, -1); /* weekday, daynum, dst */ if (tuple == NULL) return NULL;

1 0

python/dist/src/Misc NEWS,1.937,1.938
by bcannon＠users.sourceforge.net 01 Mar '04

01 Mar '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29826/Misc Modified Files: NEWS Log Message: Have strftime() check its time tuple argument to make sure the tuple's values are within proper boundaries as specified in the docs. This can break possible code (datetime module needed changing, for instance) that uses 0 for values that need to be greater 1 or greater (month, day, and day of year). Fixes bug #897625. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.937 retrieving revision 1.938 diff -C2 -d -r1.937 -r1.938 *** NEWS 19 Feb 2004 19:35:22 -0000 1.937 --- NEWS 2 Mar 2004 04:38:09 -0000 1.938 *************** *** 168,171 **** --- 168,178 ---- ----------------- + - time.strftime() now checks that the values in its time tuple argument + are within the proper boundaries to prevent possible crashes from the + platform's C library implementation of strftime(). Can possibly + break code that uses values outside the range that didn't cause + problems previously (such as sitting day of year to 0). Fixes bug + #897625. + - The socket module now supports Bluetooth sockets, if the system has <bluetooth/bluetooth.h>

1 0

python/dist/src/Doc/lib libtime.tex,1.62,1.63
by bcannon＠users.sourceforge.net 01 Mar '04

01 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29826/Doc/lib Modified Files: libtime.tex Log Message: Have strftime() check its time tuple argument to make sure the tuple's values are within proper boundaries as specified in the docs. This can break possible code (datetime module needed changing, for instance) that uses 0 for values that need to be greater 1 or greater (month, day, and day of year). Fixes bug #897625. Index: libtime.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libtime.tex,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** libtime.tex 31 Dec 2003 04:52:36 -0000 1.62 --- libtime.tex 2 Mar 2004 04:38:10 -0000 1.63 *************** *** 212,217 **** specified by the \var{format} argument. If \var{t} is not provided, the current time as returned by \function{localtime()} is ! used. \var{format} must be a string. \versionchanged[Allowed \var{t} to be omitted]{2.1} The following directives can be embedded in the \var{format} string. --- 212,220 ---- specified by the \var{format} argument. If \var{t} is not provided, the current time as returned by \function{localtime()} is ! used. \var{format} must be a string. \exception{ValueError} is raised ! if any field in \var{t} is outside of the allowed range. \versionchanged[Allowed \var{t} to be omitted]{2.1} + \versionchanged[\exception{ValueError} raised if a field in \var{t} is + out of range.]{2.4} The following directives can be embedded in the \var{format} string.

1 0

grow "Date Number"543583
by louellaneadow＠pammy.com 01 Mar '04

01 Mar '04

REALLY lay the pipe to the next chick you screw... http://aid.emarkdinbs.com/vp5 No more of this sort of material. Honoured in 24-48 hours. http://sir.amilsdcx.com/a.html helix skullcap marsha conveyor rangeland stick rawhide catheter befell wherein dither diem backside allegory consonantal inexplicit stammer backdrop ecosystem won meanwhile lomb treacherous minstrelsy dawson tribunal apparition muddlehead caveman tyrannic bayesian corpus barlow hS

1 0

python/dist/src/Lib asynchat.py,1.23,1.24
by rhettinger＠users.sourceforge.net 01 Mar '04

01 Mar '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4871/lib Modified Files: asynchat.py Log Message: Replace left(), right(), and __reversed__() with the more general purpose __getitem__() and __setitem__(). Simplifies the API, reduces the code size, adds flexibility, and makes deques work with bisect.bisect(), random.shuffle(), and random.sample(). Index: asynchat.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/asynchat.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** asynchat.py 29 Feb 2004 02:15:56 -0000 1.23 --- asynchat.py 1 Mar 2004 23:16:22 -0000 1.24 *************** *** 263,267 **** def first (self): ! return self.list.left() def push (self, data): --- 263,267 ---- def first (self): ! return self.list[0] def push (self, data):

1 0

python/dist/src/Lib/test test_deque.py,1.6,1.7
by rhettinger＠users.sourceforge.net 01 Mar '04

01 Mar '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4871/lib/test Modified Files: test_deque.py Log Message: Replace left(), right(), and __reversed__() with the more general purpose __getitem__() and __setitem__(). Simplifies the API, reduces the code size, adds flexibility, and makes deques work with bisect.bisect(), random.shuffle(), and random.sample(). Index: test_deque.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_deque.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** test_deque.py 29 Feb 2004 02:15:56 -0000 1.6 --- test_deque.py 1 Mar 2004 23:16:21 -0000 1.7 *************** *** 5,8 **** --- 5,9 ---- import cPickle as pickle from cStringIO import StringIO + import random BIG = 100000 *************** *** 58,68 **** self.assertEqual(list(d), list(reversed('abcd'))) ! def test_leftright(self): d = deque('superman') ! self.assertEqual(d.left(), 's') ! self.assertEqual(d.right(), 'n') d = deque() ! self.assertRaises(IndexError, d.left) ! self.assertRaises(IndexError, d.right) def test_rotate(self): --- 59,93 ---- self.assertEqual(list(d), list(reversed('abcd'))) ! def test_getitem(self): ! n = 200 ! d = deque(xrange(n)) ! l = range(n) ! for i in xrange(n): ! d.popleft() ! l.pop(0) ! if random.random() < 0.5: ! d.append(i) ! l.append(i) ! for j in xrange(1-len(l), len(l)): ! assert d[j] == l[j] ! d = deque('superman') ! self.assertEqual(d[0], 's') ! self.assertEqual(d[-1], 'n') d = deque() ! self.assertRaises(IndexError, d.__getitem__, 0) ! self.assertRaises(IndexError, d.__getitem__, -1) ! ! def test_setitem(self): ! n = 200 ! d = deque(xrange(n)) ! for i in xrange(n): ! d[i] = 10 * i ! self.assertEqual(list(d), [10*i for i in xrange(n)]) ! l = list(d) ! for i in xrange(1-n, 0, -1): ! d[i] = 7*i ! l[i] = 7*i ! self.assertEqual(list(d), l) def test_rotate(self): *************** *** 406,410 **** >>> d = deque('ghi') # make a new deque with three items >>> for elem in d: # iterate over the deque's elements ! ... print elem.upper() G H --- 431,435 ---- >>> d = deque('ghi') # make a new deque with three items >>> for elem in d: # iterate over the deque's elements ! ... print elem.upper() G H *************** *** 420,426 **** >>> list(d) # list the contents of the deque ['g', 'h', 'i'] ! >>> d.left() # peek at leftmost item 'g' ! >>> d.right() # peek at rightmost item 'i' >>> list(reversed(d)) # list the contents of a deque in reverse --- 445,451 ---- >>> list(d) # list the contents of the deque ['g', 'h', 'i'] ! >>> d[0] # peek at leftmost item 'g' ! >>> d[-1] # peek at rightmost item 'i' >>> list(reversed(d)) # list the contents of a deque in reverse *************** *** 477,481 **** counts[i] = sys.gettotalrefcount() print counts ! # doctests from test import test_deque --- 502,506 ---- counts[i] = sys.gettotalrefcount() print counts ! # doctests from test import test_deque

1 0

python/dist/src/Doc/lib libcollections.tex, 1.5, 1.6
by rhettinger＠users.sourceforge.net 01 Mar '04

01 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4871/doc/lib Modified Files: libcollections.tex Log Message: Replace left(), right(), and __reversed__() with the more general purpose __getitem__() and __setitem__(). Simplifies the API, reduces the code size, adds flexibility, and makes deques work with bisect.bisect(), random.shuffle(), and random.sample(). Index: libcollections.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcollections.tex,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** libcollections.tex 29 Feb 2004 02:15:55 -0000 1.5 --- libcollections.tex 1 Mar 2004 23:16:21 -0000 1.6 *************** *** 55,63 **** \end{methoddesc} - \begin{methoddesc}{left}{} - Return leftmost element from the deque. - If no elements are present, raises a \exception{IndexError}. - \end{methoddesc} - \begin{methoddesc}{pop}{} Remove and return an element from the right side of the deque. --- 55,58 ---- *************** *** 70,78 **** \end{methoddesc} - \begin{methoddesc}{right}{} - Return the rightmost element from the deque. - If no elements are present, raises a \exception{IndexError}. - \end{methoddesc} - \begin{methoddesc}{rotate}{n} Rotate the deque \var{n} steps to the right. If \var{n} is --- 65,68 ---- *************** *** 82,87 **** In addition to the above, deques support iteration, pickling, \samp{len(d)}, ! \samp{reversed(d)}, \samp{copy.copy(d)}, \samp{copy.deepcopy(d)}, and ! membership testing with the \keyword{in} operator. Example: --- 72,78 ---- In addition to the above, deques support iteration, pickling, \samp{len(d)}, ! \samp{reversed(d)}, \samp{copy.copy(d)}, \samp{copy.deepcopy(d)}, ! membership testing with the \keyword{in} operator, and subscript references ! such as \samp{d[-1]}. Example: *************** *** 107,115 **** >>> list(d) # list the contents of the deque ['g', 'h', 'i'] ! ! >>> d.left() # peek at leftmost item 'g' ! >>> d.right() # peek at rightmost item 'i' >>> list(reversed(d)) # list the contents of a deque in reverse ['i', 'h', 'g'] --- 98,106 ---- >>> list(d) # list the contents of the deque ['g', 'h', 'i'] ! >>> d[0] # peek at leftmost item 'g' ! >>> d[-1] # peek at rightmost item 'i' + >>> list(reversed(d)) # list the contents of a deque in reverse ['i', 'h', 'g']

1 0

python/dist/src/Modules collectionsmodule.c, 1.9, 1.10
by rhettinger＠users.sourceforge.net 01 Mar '04

01 Mar '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4871/modules Modified Files: collectionsmodule.c Log Message: Replace left(), right(), and __reversed__() with the more general purpose __getitem__() and __setitem__(). Simplifies the API, reduces the code size, adds flexibility, and makes deques work with bisect.bisect(), random.shuffle(), and random.sample(). Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** collectionsmodule.c 29 Feb 2004 15:40:53 -0000 1.9 --- collectionsmodule.c 1 Mar 2004 23:16:20 -0000 1.10 *************** *** 178,213 **** static PyObject * - deque_right(dequeobject *deque, PyObject *unused) - { - PyObject *item; - - if (deque->len == 0) { - PyErr_SetString(PyExc_IndexError, "deque is empty"); - return NULL; - } - item = deque->rightblock->data[deque->rightindex]; - Py_INCREF(item); - return item; - } - - PyDoc_STRVAR(right_doc, "Return the rightmost element."); - - static PyObject * - deque_left(dequeobject *deque, PyObject *unused) - { - PyObject *item; - - if (deque->len == 0) { - PyErr_SetString(PyExc_IndexError, "deque is empty"); - return NULL; - } - item = deque->leftblock->data[deque->leftindex]; - Py_INCREF(item); - return item; - } - - PyDoc_STRVAR(left_doc, "Return the leftmost element."); - - static PyObject * deque_extend(dequeobject *deque, PyObject *iterable) { --- 178,181 ---- *************** *** 347,350 **** --- 315,381 ---- static PyObject * + deque_item(dequeobject *deque, int i) + { + block *b; + PyObject *item; + int n; + + if (i < 0 || i >= deque->len) { + PyErr_SetString(PyExc_IndexError, + "deque index out of range"); + return NULL; + } + + i += deque->leftindex; + n = i / BLOCKLEN; + i %= BLOCKLEN; + if (i < (deque->len >> 1)) { + b = deque->leftblock; + while (n--) + b = b->rightlink; + } else { + n = (deque->leftindex + deque->len - 1) / BLOCKLEN - n; + b = deque->rightblock; + while (n--) + b = b->leftlink; + } + item = b->data[i]; + Py_INCREF(item); + return item; + } + + static int + deque_ass_item(dequeobject *deque, int i, PyObject *v) + { + PyObject *old_value; + block *b; + int n; + + if (i < 0 || i >= deque->len) { + PyErr_SetString(PyExc_IndexError, + "deque index out of range"); + return -1; + } + i += deque->leftindex; + n = i / BLOCKLEN; + i %= BLOCKLEN; + if (i < (deque->len >> 1)) { + b = deque->leftblock; + while (n--) + b = b->rightlink; + } else { + n = (deque->leftindex + deque->len - 1) / BLOCKLEN - n; + b = deque->rightblock; + while (n--) + b = b->leftlink; + } + Py_INCREF(v); + old_value = b->data[i]; + b->data[i] = v; + Py_DECREF(old_value); + return 0; + } + + static PyObject * deque_clearmethod(dequeobject *deque) { *************** *** 372,376 **** static int ! set_traverse(dequeobject *deque, visitproc visit, void *arg) { block * b = deque->leftblock; --- 403,407 ---- static int ! deque_traverse(dequeobject *deque, visitproc visit, void *arg) { block * b = deque->leftblock; *************** *** 598,601 **** --- 629,636 ---- (inquiry)deque_len, /* sq_length */ 0, /* sq_concat */ + 0, /* sq_repeat */ + (intargfunc)deque_item, /* sq_item */ + 0, /* sq_slice */ + (intobjargproc)deque_ass_item, /* sq_ass_item */ }; *************** *** 603,609 **** static PyObject *deque_iter(dequeobject *deque); - static PyObject *deque_reviter(dequeobject *deque); - PyDoc_STRVAR(reversed_doc, - "D.__reversed__() -- return a reverse iterator over the deque"); static PyMethodDef deque_methods[] = { --- 638,641 ---- *************** *** 620,625 **** {"extendleft", (PyCFunction)deque_extendleft, METH_O, extendleft_doc}, - {"left", (PyCFunction)deque_left, - METH_NOARGS, left_doc}, {"pop", (PyCFunction)deque_pop, METH_NOARGS, pop_doc}, --- 652,655 ---- *************** *** 628,635 **** {"__reduce__", (PyCFunction)deque_reduce, METH_NOARGS, reduce_doc}, - {"__reversed__", (PyCFunction)deque_reviter, - METH_NOARGS, reversed_doc}, - {"right", (PyCFunction)deque_right, - METH_NOARGS, right_doc}, {"rotate", (PyCFunction)deque_rotate, METH_VARARGS, rotate_doc}, --- 658,661 ---- *************** *** 666,670 **** Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */ deque_doc, /* tp_doc */ ! (traverseproc)set_traverse, /* tp_traverse */ (inquiry)deque_clear, /* tp_clear */ (richcmpfunc)deque_richcompare, /* tp_richcompare */ --- 692,696 ---- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */ deque_doc, /* tp_doc */ ! (traverseproc)deque_traverse, /* tp_traverse */ (inquiry)deque_clear, /* tp_clear */ (richcmpfunc)deque_richcompare, /* tp_richcompare */ *************** *** 778,858 **** }; - /*********************** Deque Reverse Iterator **************************/ - - PyTypeObject dequereviter_type; - - static PyObject * - deque_reviter(dequeobject *deque) - { - dequeiterobject *it; - - it = PyObject_New(dequeiterobject, &dequereviter_type); - if (it == NULL) - return NULL; - it->b = deque->rightblock; - it->index = deque->rightindex; - Py_INCREF(deque); - it->deque = deque; - it->len = deque->len; - return (PyObject *)it; - } - - static PyObject * - dequereviter_next(dequeiterobject *it) - { - PyObject *item; - if (it->b == it->deque->leftblock && it->index < it->deque->leftindex) - return NULL; - - if (it->len != it->deque->len) { - it->len = -1; /* Make this state sticky */ - PyErr_SetString(PyExc_RuntimeError, - "deque changed size during iteration"); - return NULL; - } - - item = it->b->data[it->index]; - it->index--; - if (it->index == -1 && it->b->leftlink != NULL) { - it->b = it->b->leftlink; - it->index = BLOCKLEN - 1; - } - Py_INCREF(item); - return item; - } - - PyTypeObject dequereviter_type = { - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "deque_reverse_iterator", /* tp_name */ - sizeof(dequeiterobject), /* tp_basicsize */ - 0, /* tp_itemsize */ - /* methods */ - (destructor)dequeiter_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ - 0, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - PyObject_SelfIter, /* tp_iter */ - (iternextfunc)dequereviter_next, /* tp_iternext */ - 0, - }; - /* module level code ********************************************************/ --- 804,807 ---- *************** *** 876,882 **** return; - if (PyType_Ready(&dequereviter_type) < 0) - return; - return; } --- 825,828 ----

1 0

Google adwords - A license to print money
by Jarred Pearce 01 Mar '04

01 Mar '04

1 0