Mailman 3 January 2004 - Python-checkins

python/dist/src/Doc/lib liboptparse.tex, 1.11, 1.12
by fdrake＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2707 Modified Files: liboptparse.tex Log Message: fix markup Index: liboptparse.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liboptparse.tex,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** liboptparse.tex 26 Jan 2004 19:30:21 -0000 1.11 --- liboptparse.tex 26 Jan 2004 19:39:13 -0000 1.12 *************** *** 1712,1715 **** \begin{seealso} ! \seemodule{getopt}{More traditional Unix-style command line option parsing} \end{seealso} --- 1712,1715 ---- \begin{seealso} ! \seemodule{getopt}{More traditional \UNIX-style command line option parsing.} \end{seealso}

1 0

python/dist/src/Doc/lib libgetopt.tex, 1.21, 1.22 liboptparse.tex, 1.10, 1.11
by montanaro＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv530 Modified Files: libgetopt.tex liboptparse.tex Log Message: add references between getopt and optparse docs Index: libgetopt.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libgetopt.tex,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** libgetopt.tex 29 Apr 2003 04:35:36 -0000 1.21 --- libgetopt.tex 26 Jan 2004 19:30:21 -0000 1.22 *************** *** 144,145 **** --- 144,149 ---- main() \end{verbatim} + + \begin{seealso} + \seemodule{optparse}{More object-oriented command line option parsing} + \end{seealso} Index: liboptparse.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liboptparse.tex,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** liboptparse.tex 16 Jul 2003 17:58:38 -0000 1.10 --- liboptparse.tex 26 Jan 2004 19:30:21 -0000 1.11 *************** *** 1710,1711 **** --- 1710,1715 ---- \verbatiminput{required_2.py} + + \begin{seealso} + \seemodule{getopt}{More traditional Unix-style command line option parsing} + \end{seealso}

1 0

python/dist/src/Lib optparse.py,1.5,1.6
by fdrake＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14137 Modified Files: optparse.py Log Message: don't wrap lines too late by default closes SF bug #842213 Index: optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/optparse.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** optparse.py 8 May 2003 01:38:52 -0000 1.5 --- optparse.py 26 Jan 2004 16:42:30 -0000 1.6 *************** *** 248,252 **** indent_increment=2, max_help_position=24, ! width=80, short_first=1): HelpFormatter.__init__( --- 248,252 ---- indent_increment=2, max_help_position=24, ! width=79, short_first=1): HelpFormatter.__init__( *************** *** 267,271 **** indent_increment=0, max_help_position=24, ! width=80, short_first=0): HelpFormatter.__init__ ( --- 267,271 ---- indent_increment=0, max_help_position=24, ! width=79, short_first=0): HelpFormatter.__init__ (

3 3

python/dist/src/Lib optparse.py,1.5,1.5.8.1
by bwarsaw＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17755 Modified Files: Tag: release23-maint optparse.py Log Message: Backporting revision 1.6: don't wrap lines too late by default closes SF bug #842213 But I think Fred meant "too long" :) Index: optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/optparse.py,v retrieving revision 1.5 retrieving revision 1.5.8.1 diff -C2 -d -r1.5 -r1.5.8.1 *** optparse.py 8 May 2003 01:38:52 -0000 1.5 --- optparse.py 26 Jan 2004 18:40:49 -0000 1.5.8.1 *************** *** 248,252 **** indent_increment=2, max_help_position=24, ! width=80, short_first=1): HelpFormatter.__init__( --- 248,252 ---- indent_increment=2, max_help_position=24, ! width=79, short_first=1): HelpFormatter.__init__( *************** *** 267,271 **** indent_increment=0, max_help_position=24, ! width=80, short_first=0): HelpFormatter.__init__ ( --- 267,271 ---- indent_increment=0, max_help_position=24, ! width=79, short_first=0): HelpFormatter.__init__ (

1 0

python/nondist/sandbox/collections dequemodule.c, 1.2, 1.3
by rhettinger＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/nondist/sandbox/collections In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9172 Modified Files: dequemodule.c Log Message: Fix nits Index: dequemodule.c =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/collections/dequemodule.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dequemodule.c 26 Jan 2004 16:28:01 -0000 1.2 --- dequemodule.c 26 Jan 2004 18:08:10 -0000 1.3 *************** *** 379,383 **** METH_NOARGS, pop_doc}, {"popleft", (PyCFunction)deque_popleft, ! METH_NOARGS, pop_doc}, {"__reduce__", (PyCFunction)deque_reduce, METH_NOARGS, reduce_doc}, --- 379,383 ---- METH_NOARGS, pop_doc}, {"popleft", (PyCFunction)deque_popleft, ! METH_NOARGS, popleft_doc}, {"__reduce__", (PyCFunction)deque_reduce, METH_NOARGS, reduce_doc}, *************** *** 487,491 **** PyObject_HEAD_INIT(NULL) 0, /* ob_size */ ! "dequeerseiterator", /* tp_name */ sizeof(dequeiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ --- 487,491 ---- PyObject_HEAD_INIT(NULL) 0, /* ob_size */ ! "deque_iterator", /* tp_name */ sizeof(dequeiterobject), /* tp_basicsize */ 0, /* tp_itemsize */

1 0

python/nondist/sandbox/collections timedeque.py, 1.1, 1.2
by rhettinger＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/nondist/sandbox/collections In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4997 Modified Files: timedeque.py Log Message: One more timing Index: timedeque.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/collections/timedeque.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** timedeque.py 26 Jan 2004 16:23:16 -0000 1.1 --- timedeque.py 26 Jan 2004 17:54:31 -0000 1.2 *************** *** 22,25 **** --- 22,26 ---- 'la(1)', # Buildup through appends 'da(1)', + 'dal(1)', 'la(1); lp()', # Steady state stack 'da(1); dp()',

1 0

python/nondist/sandbox/collections pydeque.py, NONE, 1.1
by rhettinger＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/nondist/sandbox/collections In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3186 Added Files: pydeque.py Log Message: Add pure python version to aid review. --- NEW FILE: pydeque.py --- n = 30 LFTLNK = n RGTLNK = n+1 BLOCKSIZ = n+2 class deque(object): def __init__(self, iterable=()): self.right = self.left = [None] * BLOCKSIZ self.rightndx = n//2 # points to last written element self.leftndx = n//2+1 add = self.append for elem in iterable: add(elem) def append(self, x): self.rightndx += 1 if self.rightndx == n: newblock = [None] * BLOCKSIZ self.right[RGTLNK] = newblock newblock[LFTLNK] = self.right self.right = newblock self.rightndx = 0 self.right[self.rightndx] = x def appendleft(self, x): self.leftndx -= 1 if self.leftndx == -1: newblock = [None] * BLOCKSIZ self.left[LFTLNK] = newblock newblock[RGTLNK] = self.left self.left = newblock self.leftndx = n-1 self.left[self.leftndx] = x def pop(self): if self.left is self.right and self.leftndx > self.rightndx: raise IndexError x = self.right[self.rightndx] self.right[self.rightndx] = None self.rightndx -= 1 if self.rightndx == -1: prevblock = self.right[LFTLNK] prevblock[RGTLNK] = None self.right[LFTLNK] = None self.right = prevblock self.rightndx = n-1 return x def popleft(self): if self.left is self.right and self.leftndx > self.rightndx: raise IndexError x = self.left[self.leftndx] self.left[self.leftndx] = None self.leftndx += 1 if self.leftndx == n: prevblock = self.left[RGTLNK] prevblock[LFTLNK] = None self.left[RGTLNK] = None self.left = prevblock self.leftndx = 0 return x def __repr__(self): return 'deque(%r)' % (list(self),) def __iter__(self): block = self.left while block: l, r = 0, n if block is self.left: l = self.leftndx if block is self.right: r = self.rightndx + 1 for elem in block[l:r]: yield elem block = block[RGTLNK] def __len__(self): sum = 0 block = self.left while block: sum += n block = block[RGTLNK] return sum + self.rightndx - self.leftndx + 1 - n def __reduce__(self): return (type(self), tuple(self)) def __hash__(self): raise TypeError def __copy__(self): return self.__class__(self) if __name__ == '__main__': a = deque() for i in xrange(10): a.append(i) for i in [-1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11]: a.appendleft(i) print a, len(a) print list(a) b = deque(a) for i in xrange(18): print a.popleft() print a, len(a) print b, len(b)

1 0

python/nondist/sandbox/collections dequemodule.c, 1.1, 1.2
by rhettinger＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/nondist/sandbox/collections In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9728 Modified Files: dequemodule.c Log Message: Inline the append operation for the constructor (20% speedup). Index: dequemodule.c =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/collections/dequemodule.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dequemodule.c 26 Jan 2004 05:25:38 -0000 1.1 --- dequemodule.c 26 Jan 2004 16:28:01 -0000 1.2 *************** *** 325,329 **** deque_init(dequeobject *deque, PyObject *args, PyObject *kwds) { ! PyObject *iterable = NULL, *it, *item, *rv; if (!PyArg_UnpackTuple(args, "deque", 0, 1, &iterable)) --- 325,329 ---- deque_init(dequeobject *deque, PyObject *args, PyObject *kwds) { ! PyObject *iterable = NULL, *it, *item; if (!PyArg_UnpackTuple(args, "deque", 0, 1, &iterable)) *************** *** 336,345 **** while ((item = PyIter_Next(it)) != NULL) { ! assert (item != NULL); ! rv = deque_append(deque, item); ! Py_DECREF(item); ! if (rv == NULL) ! return -1; ! Py_DECREF(rv); } Py_DECREF(it); --- 336,353 ---- while ((item = PyIter_Next(it)) != NULL) { ! deque->rightindex++; ! deque->len++; ! if (deque->rightindex == BLOCKLEN) { ! block *b = newblock(deque->rightblock, NULL); ! if (b == NULL) { ! Py_DECREF(it); ! Py_DECREF(item); ! return -1; ! } ! deque->rightblock->rightlink = b; ! deque->rightblock = b; ! deque->rightindex = 0; ! } ! deque->rightblock->data[deque->rightindex] = item; } Py_DECREF(it);

1 0

python/nondist/sandbox/collections timedeque.py, NONE, 1.1
by rhettinger＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/nondist/sandbox/collections In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8098 Added Files: timedeque.py Log Message: Measure performance of deques --- NEW FILE: timedeque.py --- from timeit import Timer setup = """ from deque import deque init = range(100) d = deque(init) l = list(init) da = d.append la = l.append dp = d.pop lp = l.pop dpl = d.popleft dal = d.appendleft from itertools import chain def irange(x): for i in xrange(x): yield i big = irange(1000) """ tests = [ 'la(1)', # Buildup through appends 'da(1)', 'la(1); lp()', # Steady state stack 'da(1); dp()', 'dal(1); dpl()', 'la(1); lp(0)', # Steady state queue 'da(1); dpl()', 'dal(l); dp()', ] longtests = [ 'list(xrange(1000))',# Constructor source len known 'deque(xrange(1000))', 'list(irange(100))',# Constructor source len unknown 'deque(irange(100))', 'min(l)', # iter 'min(d)', ] for test in tests: t = min(Timer(test, setup).repeat(5)) print '%.3f\t%s' % (t, test) for test in longtests: t = min(Timer(test, setup).repeat(5, 10000)) print '%.3f\t%s' % (t, test)

1 0

python/dist/src/Doc/inst inst.tex,1.52,1.53
by fdrake＠projects.sourceforge.net Jan. 26, 2004

Jan. 26, 2004

Update of /cvsroot/python/python/dist/src/Doc/inst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16779 Modified Files: inst.tex Log Message: make this distutils doc match the other in using boilerplate.tex Index: inst.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/inst/inst.tex,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** inst.tex 2 Jan 2004 06:57:49 -0000 1.52 --- inst.tex 26 Jan 2004 15:07:31 -0000 1.53 *************** *** 17,20 **** --- 17,22 ---- % and Feeding of a Python Installation" talk in here somewhere. Yow! + \input{boilerplate} + \author{Greg Ward} \authoraddress{

1 0