Mailman 3 October 2004 - Python-checkins

[Python-checkins] python/dist/src/Modules collectionsmodule.c, 1.26, 1.27
by tim_one＠users.sourceforge.net 01 Oct '04

01 Oct '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18895/Modules Modified Files: collectionsmodule.c Log Message: deque_traverse(): If the deque had one block, and its rightindex was BLOCKLEN-1, this assert-failed in a debug build, or went wild with a NULL pointer in a release build. Reported on c.l.py by Stefan Behnel. Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- collectionsmodule.c 1 Oct 2004 01:35:54 -0000 1.26 +++ collectionsmodule.c 1 Oct 2004 02:01:04 -0000 1.27 @@ -478,19 +478,22 @@ static int deque_traverse(dequeobject *deque, visitproc visit, void *arg) { - block * b = deque->leftblock; - int index = deque->leftindex; + block *b; PyObject *item; + int index; + int indexlo = deque->leftindex; - while (b != deque->rightblock || index <= deque->rightindex) { - item = b->data[index]; - index++; - if (index == BLOCKLEN ) { - assert(b->rightlink != NULL); - b = b->rightlink; - index = 0; + assert(deque->leftblock != NULL); + for (b = deque->leftblock; b != NULL; b = b->rightlink) { + const int indexhi = b == deque->rightblock ? + deque->rightindex : + BLOCKLEN - 1; + + for (index = indexlo; index <= indexhi; ++index) { + item = b->data[index]; + Py_VISIT(item); } - Py_VISIT(item); + indexlo = 0; } return 0; }

1 0

[Python-checkins] python/dist/src/Modules collectionsmodule.c, 1.25, 1.26
by tim_one＠users.sourceforge.net 01 Oct '04

01 Oct '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15451/Modules Modified Files: collectionsmodule.c Log Message: Typos in new comments. Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- collectionsmodule.c 1 Oct 2004 01:32:53 -0000 1.25 +++ collectionsmodule.c 1 Oct 2004 01:35:54 -0000 1.26 @@ -14,13 +14,13 @@ * and the rightmost block has rightlink==NULL). A deque d's first * element is at d.leftblock[leftindex] and its last element is at * d.rightblock[rightindex]; note that, unlike as for Python slice - * indices, this indices are inclusive on both ends. + * indices, these indices are inclusive on both ends. * The list of blocks is never empty. An empty deque d has * d.leftblock == d.rightblock != NULL; d.len == 0; and * d.leftindex > d.rightindex; checking for d.len == 0 is the intended * way to see whether d is empty. * Note that since d.leftindex and d.rightindex may be indices into - * distinct blocks (and certainly are, for and d with len(d) > BLOCKLEN), + * distinct blocks (and certainly are, for any d with len(d) > BLOCKLEN), * it's not generally true that d.leftindex <= d.rightindex. */

1 0

[Python-checkins] python/dist/src/Modules collectionsmodule.c, 1.24, 1.25
by tim_one＠users.sourceforge.net 01 Oct '04

01 Oct '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14968/Modules Modified Files: collectionsmodule.c Log Message: Document some reverse-engineered invariants and pragmatic hints. Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- collectionsmodule.c 1 Oct 2004 01:04:50 -0000 1.24 +++ collectionsmodule.c 1 Oct 2004 01:32:53 -0000 1.25 @@ -9,6 +9,21 @@ #define BLOCKLEN 46 +/* A `dequeobject` is composed of a doubly-linked list of `block` nodes. + * This list is not circular (the leftmost block has leftlink==NULL, + * and the rightmost block has rightlink==NULL). A deque d's first + * element is at d.leftblock[leftindex] and its last element is at + * d.rightblock[rightindex]; note that, unlike as for Python slice + * indices, this indices are inclusive on both ends. + * The list of blocks is never empty. An empty deque d has + * d.leftblock == d.rightblock != NULL; d.len == 0; and + * d.leftindex > d.rightindex; checking for d.len == 0 is the intended + * way to see whether d is empty. + * Note that since d.leftindex and d.rightindex may be indices into + * distinct blocks (and certainly are, for and d with len(d) > BLOCKLEN), + * it's not generally true that d.leftindex <= d.rightindex. + */ + typedef struct BLOCK { struct BLOCK *leftlink; struct BLOCK *rightlink; @@ -31,8 +46,8 @@ PyObject_HEAD block *leftblock; block *rightblock; - int leftindex; - int rightindex; + int leftindex; /* in range(BLOCKLEN) */ + int rightindex; /* in range(BLOCKLEN) */ int len; PyObject *weakreflist; /* List of weak references */ } dequeobject;

1 0

python/dist/src/Doc/lib liboptparse.tex, 1.16, 1.17
by gward＠users.sourceforge.net 01 Oct '04

01 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11932 Modified Files: liboptparse.tex Log Message: Get references working (except for references to "Extending optparse", which isn't being converted from reST yet). Index: liboptparse.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liboptparse.tex,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- liboptparse.tex 28 Sep 2004 01:30:23 -0000 1.16 +++ liboptparse.tex 1 Oct 2004 01:16:39 -0000 1.17 @@ -175,7 +175,7 @@ argument. \code{"foo"} and \code{"bar"} are positional arguments. -\subsubsection{What are options for?\label{optparse-what-are-options-for?}} +\subsubsection{What are options for?\label{optparse-what-options-for}} Options are used to provide extra information to tune or customize the execution of a program. In case it wasn't clear, options are usually @@ -209,7 +209,7 @@ another, or several files to another directory. -\subsubsection{What are positional arguments for?\label{optparse-what-are-positional-arguments-for?}} +\subsubsection{What are positional arguments for?\label{optparse-what-positional-arguments-for}} Positional arguments are for those pieces of information that your program absolutely, positively requires to run. @@ -302,7 +302,7 @@ Of these, \member{action} is the most fundamental. -\subsubsection{Option actions\label{optparse-option-actions}} +\subsubsection{Understanding option actions\label{optparse-understanding-option-actions}} Actions tell \module{optparse} what to do when it encounters an option on the command line. There is a fixed set of actions hard-coded into \module{optparse}; @@ -314,7 +314,7 @@ If you don't specify an option action, \module{optparse} defaults to \code{store}. -\subsubsection{The store action\label{optparse-the-store-action}} +\subsubsection{The store action\label{optparse-store-action}} The most common option action is \code{store}, which tells \module{optparse} to take the next argument (or the remainder of the current argument), ensure @@ -374,7 +374,7 @@ types is covered in section~\ref{optparse-extending}, Extending \module{optparse}. -\subsubsection{Handling flag (boolean) options\label{optparse-handling-flag-(boolean)-options}} +\subsubsection{Handling boolean (flag) options\label{optparse-handling-boolean-options}} Flag options{---}set a variable to true or false when a particular option is seen{---}are quite common. \module{optparse} supports them with two separate @@ -387,7 +387,7 @@ Here we have two different options with the same destination, which is perfectly OK. (It just means you have to be a bit careful when setting -default values{---}see section~\ref{optparse-default-values}, Default values, below.) +default values{---}see below.) When \module{optparse} encounters \code{"-v"} on the command line, it sets \code{options.verbose} to \code{True}; when it encounters \code{"-q"}, @@ -408,8 +408,7 @@ call a specified function \end{description} -These are covered in the section~\ref{None}, Reference Guide and section~\ref{None}, Option Callbacks -documents. +These are covered in section~\ref{optparse-reference-guide}, Reference Guide and section~\ref{optparse-option-callbacks}, Option Callbacks. \subsubsection{Default values\label{optparse-default-values}} @@ -558,7 +557,7 @@ \end{itemize} -\subsubsection{Printing a version string\label{optparse-printing-a-version-string}} +\subsubsection{Printing a version string\label{optparse-printing-version-string}} Similar to the brief usage string, \module{optparse} can also print a version string for your program. You have to supply the string as the \code{version} @@ -581,7 +580,7 @@ \end{verbatim} -\subsubsection{Error-handling\label{optparse-error-handling}} +\subsubsection{How \module{optparse} handles errors\label{optparse-how-optik-handles-errors}} There are two broad classes of errors that \module{optparse} has to worry about: programmer errors and user errors. Programmer errors are usually @@ -666,11 +665,11 @@ \subsection{Reference Guide\label{optparse-reference-guide}} -\subsubsection{Populating the parser\label{optparse-populating-the-parser}} +\subsubsection{Populating the parser\label{optparse-populating-parser}} There are several ways to populate the parser with options. The preferred way is by using \code{OptionParser.add{\_}option()}, as shown in -section~\ref{None}, the tutorial section. \method{add{\_}option()} can be called in one of two +section~\ref{optparse-tutorial}, the tutorial. \method{add{\_}option()} can be called in one of two ways: \begin{itemize} \item {} @@ -802,7 +801,7 @@ options. -\subsubsection{Option actions\label{optparse-option-actions}} +\subsubsection{Standard option actions\label{optparse-standard-option-actions}} The various option actions all have slightly different requirements and effects. Most actions have several relevant option attributes which you @@ -950,7 +949,7 @@ *args, **kwargs) \end{verbatim} -See section~\ref{None}, Option Callbacks for more detail. +See section~\ref{optparse-option-callbacks}, Option Callbacks for more detail. \item {} \member{help} @@ -1008,7 +1007,7 @@ \end{itemize} -\subsubsection{Option types\label{optparse-option-types}} +\subsubsection{Standard option types\label{optparse-standard-option-types}} \module{optparse} has six built-in option types: \code{string}, \code{int}, \code{long}, \code{choice}, \code{float} and \code{complex}. If you need to add new option @@ -1036,7 +1035,7 @@ OptionValueError if an invalid string is given. -\subsubsection{Querying and manipulating your option parser\label{optparse-querying-and-manipulating-your-option-parser}} +\subsubsection{Querying and manipulating your option parser\label{optparse-querying-manipulating-option-parser}} Sometimes, it's useful to poke around your option parser and see what's there. OptionParser provides a couple of methods to help you out: @@ -1154,7 +1153,7 @@ \end{itemize} -\subsubsection{Defining a callback option\label{optparse-defining-a-callback-option}} +\subsubsection{Defining a callback option\label{optparse-defining-callback-option}} As always, the easiest way to define a callback option is by using the \code{parser.add{\_}option()} method. Apart from \member{action}, the only option @@ -1202,7 +1201,7 @@ \end{description} -\subsubsection{How callbacks are called\label{optparse-how-callbacks-are-called}} +\subsubsection{How callbacks are called\label{optparse-how-callbacks-called}} All callbacks are called as follows: \begin{verbatim} @@ -1259,7 +1258,7 @@ \end{description} -\subsubsection{Error handling\label{optparse-error-handling}} +\subsubsection{Raising errors in a callback\label{optparse-raising-errors-in-callback}} The callback function should raise OptionValueError if there are any problems with the option or its argument(s). \module{optparse} catches this and @@ -1269,7 +1268,7 @@ figuring out what he did wrong. -\subsubsection{Callback example 1: trivial callback\label{optparse-callback-example-1:-trivial-callback}} +\subsubsection{Callback example 1: trivial callback\label{optparse-callback-example-1}} Here's an example of a callback option that takes no arguments, and simply records that the option was seen: @@ -1283,7 +1282,7 @@ Of course, you could do that with the \code{store{\_}true} action. -\subsubsection{Callback example 2: check option order\label{optparse-callback-example-2:-check-option-order}} +\subsubsection{Callback example 2: check option order\label{optparse-callback-example-2}} Here's a slightly more interesting example: record the fact that \code{"-a"} is seen, but blow up if it comes after \code{"-b"} in the @@ -1299,7 +1298,7 @@ \end{verbatim} -\subsubsection{Callback example 3: check option order (generalized)\label{optparse-callback-example-3:-check-option-order-(generalized)}} +\subsubsection{Callback example 3: check option order (generalized)\label{optparse-callback-example-3}} If you want to re-use this callback for several similar options (set a flag, but blow up if \code{"-b"} has already been seen), it needs a bit of @@ -1317,7 +1316,7 @@ \end{verbatim} -\subsubsection{Callback example 4: check arbitrary condition\label{optparse-callback-example-4:-check-arbitrary-condition}} +\subsubsection{Callback example 4: check arbitrary condition\label{optparse-callback-example-4}} Of course, you could put any condition in there{---}you're not limited to checking the values of already-defined options. For example, if @@ -1338,7 +1337,7 @@ reader.) -\subsubsection{Callback example 5: fixed arguments\label{optparse-callback-example-5:-fixed-arguments}} +\subsubsection{Callback example 5: fixed arguments\label{optparse-callback-example-5}} Things get slightly more interesting when you define callback options that take a fixed number of arguments. Specifying that a callback @@ -1362,7 +1361,7 @@ obviously you don't need a callback for this example.) -\subsubsection{Callback example 6: variable arguments\label{optparse-callback-example-6:-variable-arguments}} +\subsubsection{Callback example 6: variable arguments\label{optparse-callback-example-6}} Things get hairy when you want an option to take a variable number of arguments. For this case, you must write a callback, as \module{optparse} doesn't

1 0

[Python-checkins] python/dist/src/Modules collectionsmodule.c, 1.23, 1.24
by tim_one＠users.sourceforge.net 01 Oct '04

01 Oct '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9904/Modules Modified Files: collectionsmodule.c Log Message: Definition consistency. Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- collectionsmodule.c 1 Oct 2004 01:03:29 -0000 1.23 +++ collectionsmodule.c 1 Oct 2004 01:04:50 -0000 1.24 @@ -15,7 +15,8 @@ PyObject *data[BLOCKLEN]; } block; -static block *newblock(block *leftlink, block *rightlink) { +static block * +newblock(block *leftlink, block *rightlink) { block *b = PyMem_Malloc(sizeof(block)); if (b == NULL) { PyErr_NoMemory();

1 0

[Python-checkins] python/dist/src/Modules collectionsmodule.c, 1.22, 1.23
by tim_one＠users.sourceforge.net 01 Oct '04

01 Oct '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9722/Modules Modified Files: collectionsmodule.c Log Message: Trimmed trailing whitespace. Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- collectionsmodule.c 19 Jul 2004 00:10:24 -0000 1.22 +++ collectionsmodule.c 1 Oct 2004 01:03:29 -0000 1.23 @@ -48,7 +48,7 @@ deque = (dequeobject *)type->tp_alloc(type, 0); if (deque == NULL) return NULL; - + b = newblock(NULL, NULL); if (b == NULL) { Py_DECREF(deque); @@ -206,12 +206,12 @@ deque->rightblock->data[deque->rightindex] = item; } Py_DECREF(it); - if (PyErr_Occurred()) + if (PyErr_Occurred()) return NULL; Py_RETURN_NONE; } -PyDoc_STRVAR(extend_doc, +PyDoc_STRVAR(extend_doc, "Extend the right side of the deque with elements from the iterable"); static PyObject * @@ -246,7 +246,7 @@ Py_RETURN_NONE; } -PyDoc_STRVAR(extendleft_doc, +PyDoc_STRVAR(extendleft_doc, "Extend the left side of the deque with elements from the iterable"); static PyObject * @@ -289,7 +289,7 @@ Py_RETURN_NONE; } -PyDoc_STRVAR(rotate_doc, +PyDoc_STRVAR(rotate_doc, "Rotate the deque n steps to the right (default n=1). If n is negative, rotates left."); static int @@ -354,7 +354,7 @@ /* delitem() implemented in terms of rotate for simplicity and reasonable performance near the end points. If for some reason this method becomes - popular, it is not hard to re-implement this using direct data movement + popular, it is not hard to re-implement this using direct data movement (similar to code in list slice assignment) and achieve a two or threefold performance boost. */ @@ -365,7 +365,7 @@ PyObject *item=NULL, *minus_i=NULL, *plus_i=NULL; int rv = -1; - assert (i >= 0 && i < deque->len); + assert (i >= 0 && i < deque->len); minus_i = Py_BuildValue("(i)", -i); if (minus_i == NULL) @@ -376,7 +376,7 @@ goto fail; item = deque_rotate(deque, minus_i); - if (item == NULL) + if (item == NULL) goto fail; Py_DECREF(item); @@ -385,7 +385,7 @@ Py_DECREF(item); item = deque_rotate(deque, plus_i); - if (item == NULL) + if (item == NULL) goto fail; rv = 0; @@ -489,7 +489,7 @@ static PyObject * deque_copy(PyObject *deque) { - return PyObject_CallFunctionObjArgs((PyObject *)(deque->ob_type), + return PyObject_CallFunctionObjArgs((PyObject *)(deque->ob_type), deque, NULL); } @@ -582,7 +582,7 @@ } Py_ReprLeave(deque); Py_DECREF(it); - if (PyErr_Occurred()) + if (PyErr_Occurred()) return -1; fputs("])", fp); return 0; @@ -594,7 +594,7 @@ PyObject *it1=NULL, *it2=NULL, *x, *y; int i, b, vs, ws, minlen, cmp=-1; - if (!PyObject_TypeCheck(v, &deque_type) || + if (!PyObject_TypeCheck(v, &deque_type) || !PyObject_TypeCheck(w, &deque_type)) { Py_INCREF(Py_NotImplemented); return Py_NotImplemented; @@ -654,7 +654,7 @@ case Py_GT: cmp = vs > ws; break; case Py_GE: cmp = vs >= ws; break; } - + done: Py_XDECREF(it1); Py_XDECREF(it2); @@ -695,31 +695,31 @@ static PyObject *deque_iter(dequeobject *deque); static PyObject *deque_reviter(dequeobject *deque); -PyDoc_STRVAR(reversed_doc, +PyDoc_STRVAR(reversed_doc, "D.__reversed__() -- return a reverse iterator over the deque"); static PyMethodDef deque_methods[] = { - {"append", (PyCFunction)deque_append, + {"append", (PyCFunction)deque_append, METH_O, append_doc}, - {"appendleft", (PyCFunction)deque_appendleft, + {"appendleft", (PyCFunction)deque_appendleft, METH_O, appendleft_doc}, - {"clear", (PyCFunction)deque_clearmethod, + {"clear", (PyCFunction)deque_clearmethod, METH_NOARGS, clear_doc}, - {"__copy__", (PyCFunction)deque_copy, + {"__copy__", (PyCFunction)deque_copy, METH_NOARGS, copy_doc}, - {"extend", (PyCFunction)deque_extend, + {"extend", (PyCFunction)deque_extend, METH_O, extend_doc}, - {"extendleft", (PyCFunction)deque_extendleft, + {"extendleft", (PyCFunction)deque_extendleft, METH_O, extendleft_doc}, - {"pop", (PyCFunction)deque_pop, + {"pop", (PyCFunction)deque_pop, METH_NOARGS, pop_doc}, - {"popleft", (PyCFunction)deque_popleft, + {"popleft", (PyCFunction)deque_popleft, METH_NOARGS, popleft_doc}, - {"__reduce__", (PyCFunction)deque_reduce, + {"__reduce__", (PyCFunction)deque_reduce, METH_NOARGS, reduce_doc}, - {"__reversed__", (PyCFunction)deque_reviter, + {"__reversed__", (PyCFunction)deque_reviter, METH_NOARGS, reversed_doc}, - {"rotate", (PyCFunction)deque_rotate, + {"rotate", (PyCFunction)deque_rotate, METH_VARARGS, rotate_doc}, {NULL, NULL} /* sentinel */ }; @@ -980,7 +980,7 @@ PyModule_AddObject(m, "deque", (PyObject *)&deque_type); if (PyType_Ready(&dequeiter_type) < 0) - return; + return; if (PyType_Ready(&dequereviter_type) < 0) return;

1 0