Mailman 3 October 2003 - Python-checkins

python/dist/src/Modules itertoolsmodule.c, 1.21, 1.22
by rhettinger＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv26769/Modules Modified Files: itertoolsmodule.c Log Message: Added itertools.tee() It works like the pure python verion except: * it stops storing data after of the iterators gets deallocated * the data queue is implemented with two stacks instead of one dictionary. Index: itertoolsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/itertoolsmodule.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** itertoolsmodule.c 30 Aug 2003 00:10:06 -0000 1.21 --- itertoolsmodule.c 24 Oct 2003 08:45:23 -0000 1.22 *************** *** 8,11 **** --- 8,269 ---- */ + /* independent iterator object supporting the tee object ***************/ + + /* The tee object maintains a queue of data seen by the leading iterator + but not seen by the trailing iterator. When the leading iterator + gets data from PyIter_Next() it appends a copy to the inbasket stack. + When the trailing iterator needs data, it is popped from the outbasket + stack. If the outbasket stack is empty, then it is filled from the + inbasket (i.e. the queue is implemented using two stacks so that only + O(n) operations like append() and pop() are used to access data and + calls to reverse() never move any data element more than once). + + If one of the independent iterators gets deallocated, it sets tee's + save_mode to zero so that future calls to PyIter_Next() stop getting + saved to the queue (because there is no longer a second iterator that + may need the data). + */ + + typedef struct { + PyObject_HEAD + PyObject *it; + PyObject *inbasket; + PyObject *outbasket; + int save_mode; + int num_seen; + } teeobject; + + typedef struct { + PyObject_HEAD + teeobject *tee; + int num_seen; + } iiobject; + + static PyTypeObject ii_type; + + static PyObject * + ii_next(iiobject *lz) + { + teeobject *to = lz->tee; + PyObject *result, *tmp; + + if (lz->num_seen == to->num_seen) { + /* This instance is leading, use iter to get more data */ + result = PyIter_Next(to->it); + if (result == NULL) + return NULL; + if (to->save_mode) + PyList_Append(to->inbasket, result); + to->num_seen++; + lz->num_seen++; + return result; + } + + /* This instance is trailing, get data from the queue */ + if (PyList_GET_SIZE(to->outbasket) == 0) { + /* outbasket is empty, so refill from the inbasket */ + tmp = to->outbasket; + to->outbasket = to->inbasket; + to->inbasket = tmp; + PyList_Reverse(to->outbasket); + assert(PyList_GET_SIZE(to->outbasket) > 0); + } + + lz->num_seen++; + return PyObject_CallMethod(to->outbasket, "pop", NULL); + } + + static void + ii_dealloc(iiobject *ii) + { + PyObject_GC_UnTrack(ii); + ii->tee->save_mode = 0; /* Stop saving data */ + Py_XDECREF(ii->tee); + PyObject_GC_Del(ii); + } + + static int + ii_traverse(iiobject *ii, visitproc visit, void *arg) + { + if (ii->tee) + return visit((PyObject *)(ii->tee), arg); + return 0; + } + + PyDoc_STRVAR(ii_doc, "Independent iterators linked to a tee() object."); + + static PyTypeObject ii_type = { + PyObject_HEAD_INIT(&PyType_Type) + 0, /* ob_size */ + "itertools.independent_iterator", /* tp_name */ + sizeof(iiobject), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)ii_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 | Py_TPFLAGS_HAVE_GC,/* tp_flags */ + ii_doc, /* tp_doc */ + (traverseproc)ii_traverse, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + PyObject_SelfIter, /* tp_iter */ + (iternextfunc)ii_next, /* tp_iternext */ + 0, /* tp_methods */ + }; + + /* tee object **********************************************************/ + + static PyTypeObject tee_type; + + static PyObject * + tee_new(PyTypeObject *type, PyObject *args, PyObject *kwds) + { + PyObject *it = NULL; + PyObject *iterable; + PyObject *inbasket = NULL, *outbasket = NULL, *result = NULL; + teeobject *to = NULL; + int i; + + if (!PyArg_UnpackTuple(args, "tee", 1, 1, &iterable)) + return NULL; + + it = PyObject_GetIter(iterable); + if (it == NULL) goto fail; + + inbasket = PyList_New(0); + if (inbasket == NULL) goto fail; + + outbasket = PyList_New(0); + if (outbasket == NULL) goto fail; + + to = (teeobject *)type->tp_alloc(type, 0); + if (to == NULL) goto fail; + + to->it = it; + to->inbasket = inbasket; + to->outbasket = outbasket; + to->save_mode = 1; + to->num_seen = 0; + + /* create independent iterators */ + result = PyTuple_New(2); + if (result == NULL) goto fail; + for (i=0 ; i<2 ; i++) { + iiobject *indep_it = PyObject_GC_New(iiobject, &ii_type); + if (indep_it == NULL) goto fail; + Py_INCREF(to); + indep_it->tee = to; + indep_it->num_seen = 0; + PyObject_GC_Track(indep_it); + PyTuple_SET_ITEM(result, i, (PyObject *)indep_it); + } + goto succeed; + fail: + Py_XDECREF(it); + Py_XDECREF(inbasket); + Py_XDECREF(outbasket); + Py_XDECREF(result); + succeed: + Py_XDECREF(to); + return result; + } + + static void + tee_dealloc(teeobject *to) + { + PyObject_GC_UnTrack(to); + Py_XDECREF(to->inbasket); + Py_XDECREF(to->outbasket); + Py_XDECREF(to->it); + to->ob_type->tp_free(to); + } + + static int + tee_traverse(teeobject *to, visitproc visit, void *arg) + { + int err; + + if (to->it) { + err = visit(to->it, arg); + if (err) + return err; + } + if (to->inbasket) { + err = visit(to->inbasket, arg); + if (err) + return err; + } + if (to->outbasket) { + err = visit(to->outbasket, arg); + if (err) + return err; + } + return 0; + } + + PyDoc_STRVAR(tee_doc, + "tee(iterable) --> (it1, it2)\n\ + \n\ + Split the iterable into to independent iterables."); + + static PyTypeObject tee_type = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "itertools.tee", /* tp_name */ + sizeof(teeobject), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)tee_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 | Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_BASETYPE, /* tp_flags */ + tee_doc, /* tp_doc */ + (traverseproc)tee_traverse, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + tee_new, /* tp_new */ + PyObject_GC_Del, /* tp_free */ + }; + /* cycle object **********************************************************/ *************** *** 1825,1828 **** --- 2083,2087 ---- char *name; PyTypeObject *typelist[] = { + &tee_type, &cycle_type, &dropwhile_type,

1 0

python/dist/src/Misc NEWS,1.875,1.876
by rhettinger＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv26769/Misc Modified Files: NEWS Log Message: Added itertools.tee() It works like the pure python verion except: * it stops storing data after of the iterators gets deallocated * the data queue is implemented with two stacks instead of one dictionary. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.875 retrieving revision 1.876 diff -C2 -d -r1.875 -r1.876 *** NEWS 23 Oct 2003 23:54:57 -0000 1.875 --- NEWS 24 Oct 2003 08:45:22 -0000 1.876 *************** *** 74,77 **** --- 74,95 ---- - Implemented (?(id/name)yes|no) support in SRE (#572936). + - random.seed() with no arguments or None uses time.time() as a default + seed. Modified to match Py2.2 behavior and use fractional seconds so + that successive runs are more likely to produce different sequences. + + - random.Random has a new method, getrandbits(k), which returns an int + with k random bits. This method is now an optional part of the API + for user defined generators. Any generator that defines genrandbits() + can now use randrange() for ranges with a length >= 2**53. Formerly, + randrange would return only even numbers for ranges that large (see + SF bug #812202). Generators that do not define genrandbits() now + issue a warning when randrange() is called with a range that large. + + - itertools now has a new function, tee() which produces two independent + iterators from a single iterable. + + - itertools.izip() with no arguments now returns an empty iterator instead + of raising a TypeError exception. + Library ------- *************** *** 108,126 **** allow any iterable. Also the Set.update() has been deprecated because it duplicates Set.union_update(). - - - random.seed() with no arguments or None uses time.time() as a default - seed. Modified to match Py2.2 behavior and use fractional seconds so - that successive runs are more likely to produce different sequences. - - - random.Random has a new method, getrandbits(k), which returns an int - with k random bits. This method is now an optional part of the API - for user defined generators. Any generator that defines genrandbits() - can now use randrange() for ranges with a length >= 2**53. Formerly, - randrange would return only even numbers for ranges that large (see - SF bug #812202). Generators that do not define genrandbits() now - issue a warning when randrange() is called with a range that large. - - - itertools.izip() with no arguments now returns an empty iterator instead - of raising a TypeError exception. - _strptime.py now has a behind-the-scenes caching mechanism for the most --- 126,129 ----

1 0

python/dist/src/Doc/lib libitertools.tex, 1.19, 1.20
by rhettinger＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv26769/Doc/lib Modified Files: libitertools.tex Log Message: Added itertools.tee() It works like the pure python verion except: * it stops storing data after of the iterators gets deallocated * the data queue is implemented with two stacks instead of one dictionary. Index: libitertools.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libitertools.tex,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** libitertools.tex 20 Oct 2003 17:01:07 -0000 1.19 --- libitertools.tex 24 Oct 2003 08:45:23 -0000 1.20 *************** *** 109,115 **** \end{verbatim} ! Note, this is the only member of the toolkit that may require ! significant auxiliary storage (depending on the length of the ! iterable). \end{funcdesc} --- 109,114 ---- \end{verbatim} ! Note, this member of the toolkit may require significant ! auxiliary storage (depending on the length of the iterable). \end{funcdesc} *************** *** 283,286 **** --- 282,311 ---- \end{funcdesc} + \begin{funcdesc}{tee}{iterable} + Return two independent iterators from a single iterable. + Equivalent to: + + \begin{verbatim} + def tee(iterable): + def gen(next, data={}, cnt=[0]): + for i in count(): + if i == cnt[0]: + item = data[i] = next() + cnt[0] += 1 + else: + item = data.pop(i) + yield item + it = iter(iterable) + return (gen(it.next), gen(it.next)) + \end{verbatim} + + Note, this member of the toolkit may require significant auxiliary + storage (depending on how much temporary data needs to be stored). + In general, if one iterator is going use most or all of the data before + the other iterator, it is faster to use \function{list()} instead of + \function{tee()}. + \versionadded{2.4} + \end{funcdesc} + \subsection{Examples \label{itertools-example}} *************** *** 370,373 **** --- 395,409 ---- return sum(imap(operator.mul, vec1, vec2)) + def flatten(listOfLists): + return list(chain(*listOfLists)) + + def repeatfunc(func, times=None, *args): + "Repeat calls to func with specified arguments." + "Example: repeatfunc(random.random)" + if times is None: + return starmap(func, repeat(args)) + else: + return starmap(func, repeat(args, times)) + def window(seq, n=2): "Returns a sliding window (of width n) over data from the iterable" *************** *** 380,397 **** result = result[1:] + (elem,) yield result - - def tee(iterable): - "Return two independent iterators from a single iterable" - def gen(next, data={}, cnt=[0]): - dpop = data.pop - for i in count(): - if i == cnt[0]: - item = data[i] = next() - cnt[0] += 1 - else: - item = dpop(i) - yield item - next = iter(iterable).next - return (gen(next), gen(next)) \end{verbatim} --- 416,419 ----

1 0

python/nondist/peps pep-0289.txt,1.9,1.10
by rhettinger＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv27174 Modified Files: pep-0289.txt Log Message: Fix typo Index: pep-0289.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0289.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pep-0289.txt 23 Oct 2003 17:02:11 -0000 1.9 --- pep-0289.txt 24 Oct 2003 01:29:14 -0000 1.10 *************** *** 133,137 **** and also:: ! g = (x**2 for i in range(10)) i.e. if a function call has a single positional argument, it can be --- 133,137 ---- and also:: ! g = (x**2 for x in range(10)) i.e. if a function call has a single positional argument, it can be

1 0

python/dist/src/Misc NEWS,1.874,1.875
by gvanrossum＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv12795/Misc Modified Files: NEWS Log Message: - The pwd module incorrectly advertised its struct type as struct_pwent; this has been renamed to struct_passwd. (The old name is still supported for backwards compatibility.) Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.874 retrieving revision 1.875 diff -C2 -d -r1.874 -r1.875 *** NEWS 21 Oct 2003 15:41:59 -0000 1.874 --- NEWS 23 Oct 2003 23:54:57 -0000 1.875 *************** *** 48,51 **** --- 48,55 ---- ----------------- + - The pwd module incorrectly advertised its struct type as + struct_pwent; this has been renamed to struct_passwd. (The old name + is still supported for backwards compatibility.) + - The xml.parsers.expat module now provides Expat 1.95.7.

1 0

python/dist/src/Modules pwdmodule.c,1.37,1.38
by gvanrossum＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv12795/Modules Modified Files: pwdmodule.c Log Message: - The pwd module incorrectly advertised its struct type as struct_pwent; this has been renamed to struct_passwd. (The old name is still supported for backwards compatibility.) Index: pwdmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/pwdmodule.c,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** pwdmodule.c 6 Dec 2002 12:48:51 -0000 1.37 --- pwdmodule.c 23 Oct 2003 23:54:57 -0000 1.38 *************** *** 185,188 **** --- 185,190 ---- PyStructSequence_InitType(&StructPwdType, &struct_pwd_type_desc); Py_INCREF((PyObject *) &StructPwdType); + PyModule_AddObject(m, "struct_passwd", (PyObject *) &StructPwdType); + /* And for b/w compatibility (this was defined by mistake): */ PyModule_AddObject(m, "struct_pwent", (PyObject *) &StructPwdType); }

1 0

python/nondist/peps pep-0006.txt,1.8,1.9
by akuchling＠users.sourceforge.net 23 Oct '03

23 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv15910 Modified Files: pep-0006.txt Log Message: Fix typo. While fixing the typo, I noticed the list of patch czars is incomplete, so it also got updated. If any of them are wrong, please correct them. E-mail addresses removed; they don't seem very useful in this PEP. Index: pep-0006.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0006.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pep-0006.txt 11 Mar 2002 17:36:50 -0000 1.8 --- pep-0006.txt 23 Oct 2003 18:20:31 -0000 1.9 *************** *** 60,64 **** Starting with Python 2.0, all feature releases are required to ! have a version number the form X.Y; patch releases will always be of the form X.Y.Z. --- 60,64 ---- Starting with Python 2.0, all feature releases are required to ! have a version number of the form X.Y; patch releases will always be of the form X.Y.Z. *************** *** 100,108 **** Patch Czar History ! Anthony Baxter (anthony(a)interlink.com.au) is the Patch Czar for 2.1.2. ! Thomas Wouters (thomas(a)xs4all.net) is the Patch Czar for 2.1.1. ! Moshe Zadka (moshez(a)zadka.site.co.il) is the Patch Czar for 2.0.1. --- 100,116 ---- Patch Czar History ! Anthony Baxter is the Patch Czar for 2.3.1 and 2.3.2. ! Barry Warsaw is the Patch Czar for 2.2.3. ! Guido van Rossum is the Patch Czar for 2.2.2. ! ! Michael Hudson is the Patch Czar for 2.2.1. ! ! Anthony Baxter is the Patch Czar for 2.1.2 and 2.1.3. ! ! Thomas Wouters is the Patch Czar for 2.1.1. ! ! Moshe Zadka is the Patch Czar for 2.0.1.

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew23.tex, 1.162, 1.163
by akuchling＠users.sourceforge.net 23 Oct '03

23 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1:/tmp/cvs-serv13464 Modified Files: whatsnew23.tex Log Message: Record an item I missed and bump the version number. [2.3 bugfix candidate.] Index: whatsnew23.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew23.tex,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** whatsnew23.tex 21 Sep 2003 23:41:02 -0000 1.162 --- whatsnew23.tex 23 Oct 2003 18:08:03 -0000 1.163 *************** *** 4,8 **** \title{What's New in Python 2.3} ! \release{1.00} \author{A.M.\ Kuchling} \authoraddress{\email{amk(a)amk.ca}} --- 4,8 ---- \title{What's New in Python 2.3} ! \release{1.01} \author{A.M.\ Kuchling} \authoraddress{\email{amk(a)amk.ca}} *************** *** 2169,2172 **** --- 2169,2177 ---- \code{PyArg_ParseTuple(\var{args}, "")} instead, but this will be slower than using \constant{METH_NOARGS}. + + \item \cfunction{PyArg_ParseTuple()} accepts new format characters for various sizes of unsigned integers: \samp{B} for \ctype{unsigned char}, + \samp{H} for \ctype{unsigned short int}, + \samp{I} for \ctype{unsigned int}, + and \samp{K} for \ctype{unsigned long long}. \item A new function, \cfunction{PyObject_DelItemString(\var{mapping},

1 0

python/nondist/peps pep-0042.txt,1.74,1.75
by akuchling＠users.sourceforge.net 23 Oct '03

23 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv12637 Modified Files: pep-0042.txt Log Message: Remove an item that got done in 2.3 Index: pep-0042.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0042.txt,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** pep-0042.txt 23 Oct 2003 17:58:20 -0000 1.74 --- pep-0042.txt 23 Oct 2003 18:03:41 -0000 1.75 *************** *** 279,299 **** build with MSVC. - - Add unsigneds to ParseTuple/BuildValue (due to David Beazley) - - Since "integers" can now have arbitrary precision and can - represent large unsigned values, can you add three new format - characters to PyArg_ParseTuple() and Py_BuildValue() for the C - datatypes "unsigned int", "unsigned long", and "unsigned long - long"? - - The "u" and "l" namespace is a little crowded (and I don't think - you would want to break that). However, here's one idea: - - 'I' - unsigned int (consistent with H and B) - 'p' - unsigned long ('p' is for positive) - 'P' - unsigned long long - - http://www.python.org/sf/454896 - Tools --- 279,282 ----

1 0

python/nondist/peps pep-0042.txt,1.73,1.74
by akuchling＠users.sourceforge.net 23 Oct '03

23 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv11542 Modified Files: pep-0042.txt Log Message: Record feature request Index: pep-0042.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0042.txt,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** pep-0042.txt 20 Jun 2003 17:07:09 -0000 1.73 --- pep-0042.txt 23 Oct 2003 17:58:20 -0000 1.74 *************** *** 261,264 **** --- 261,269 ---- http://www.python.org/sf/723287 + - The curses library is missing two important calls: newterm() and + delscreen() + + http://www.python.org/sf/665572, http://bugs.debian.org/175590 + C API wishes

1 0