Mailman 3 June 2004 - Python-checkins

python/dist/src/Objects genobject.c,NONE,1.1
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11725/Objects Added Files: genobject.c Log Message: Patch #957398: Add public API for Generator Object/Type. --- NEW FILE: genobject.c --- /* Generator object implementation */ #include "Python.h" #include "frameobject.h" #include "genobject.h" #include "ceval.h" #include "structmember.h" static int gen_traverse(PyGenObject *gen, visitproc visit, void *arg) { return visit((PyObject *)gen->gi_frame, arg); } static void gen_dealloc(PyGenObject *gen) { _PyObject_GC_UNTRACK(gen); if (gen->gi_weakreflist != NULL) PyObject_ClearWeakRefs((PyObject *) gen); Py_DECREF(gen->gi_frame); PyObject_GC_Del(gen); } static PyObject * gen_iternext(PyGenObject *gen) { PyThreadState *tstate = PyThreadState_GET(); PyFrameObject *f = gen->gi_frame; PyObject *result; if (gen->gi_running) { PyErr_SetString(PyExc_ValueError, "generator already executing"); return NULL; } if (f->f_stacktop == NULL) return NULL; /* Generators always return to their most recent caller, not * necessarily their creator. */ Py_XINCREF(tstate->frame); assert(f->f_back == NULL); f->f_back = tstate->frame; gen->gi_running = 1; result = PyEval_EvaluateFrame((PyObject *)f); gen->gi_running = 0; /* Don't keep the reference to f_back any longer than necessary. It * may keep a chain of frames alive or it could create a reference * cycle. */ Py_XDECREF(f->f_back); f->f_back = NULL; /* If the generator just returned (as opposed to yielding), signal * that the generator is exhausted. */ if (result == Py_None && f->f_stacktop == NULL) { Py_DECREF(result); result = NULL; } return result; } static PyObject * gen_getiter(PyObject *gen) { Py_INCREF(gen); return gen; } static PyMemberDef gen_memberlist[] = { {"gi_frame", T_OBJECT, offsetof(PyGenObject, gi_frame), RO}, {"gi_running", T_INT, offsetof(PyGenObject, gi_running), RO}, {NULL} /* Sentinel */ }; PyTypeObject PyGen_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, /* ob_size */ "generator", /* tp_name */ sizeof(PyGenObject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ (destructor)gen_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 */ 0, /* tp_doc */ (traverseproc)gen_traverse, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ offsetof(PyGenObject, gi_weakreflist), /* tp_weaklistoffset */ (getiterfunc)gen_getiter, /* tp_iter */ (iternextfunc)gen_iternext, /* tp_iternext */ 0, /* tp_methods */ gen_memberlist, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */ 0, /* tp_dict */ }; PyObject * PyGen_New(PyFrameObject *f) { PyGenObject *gen = PyObject_GC_New(PyGenObject, &PyGen_Type); if (gen == NULL) { Py_DECREF(f); return NULL; } gen->gi_frame = f; gen->gi_running = 0; gen->gi_weakreflist = NULL; _PyObject_GC_TRACK(gen); return (PyObject *)gen; }

1 0

python/dist/src/Doc/api concrete.tex,1.39,1.40
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11725/Doc/api Modified Files: concrete.tex Log Message: Patch #957398: Add public API for Generator Object/Type. Index: concrete.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/concrete.tex,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** concrete.tex 25 Mar 2004 08:51:22 -0000 1.39 --- concrete.tex 1 Jun 2004 15:22:40 -0000 1.40 *************** *** 2604,2605 **** --- 2604,2636 ---- \var{cell} must be non-\NULL{} and must be a cell object. \end{cfuncdesc} + + + \subsection{Generator Objects \label{gen-objects}} + + Generator objects are what Python uses to implement generator iterators. + They are normally created by iterating over a function that yields values, + rather than explicitly calling \cfunction{PyGen_New}. + + \begin{ctypedesc}{PyGenObject} + The C structure used for generator objects. + \end{ctypedesc} + + \begin{cvardesc}{PyTypeObject}{PyGen_Type} + The type object corresponding to generator objects + \end{cvardesc} + + \begin{cfuncdesc}{int}{PyGen_Check}{ob} + Return true if \var{ob} is a generator object; \var{ob} must not be + \NULL. + \end{cfuncdesc} + + \begin{cfuncdesc}{int}{PyGen_CheckExact}{ob} + Return true if \var{ob}'s type is \var{PyGen_Type} + is a generator object; \var{ob} must not be + \NULL. + \end{cfuncdesc} + + \begin{cfuncdesc}{PyObject*}{PyGen_New}{PyFrameObject *frame} + Create and return a new generator object based on the \var{frame} object. + The parameter must not be \NULL. + \end{cfuncdesc}

1 0

python/dist/src/Include genobject.h, NONE, 2.1 ceval.h, 2.50, 2.51
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11725/Include Modified Files: ceval.h Added Files: genobject.h Log Message: Patch #957398: Add public API for Generator Object/Type. --- NEW FILE: genobject.h --- /* Generator object interface */ #ifndef Py_GENOBJECT_H #define Py_GENOBJECT_H #ifdef __cplusplus extern "C" { #endif typedef struct { PyObject_HEAD /* The gi_ prefix is intended to remind of generator-iterator. */ PyFrameObject *gi_frame; /* True if generator is being executed. */ int gi_running; /* List of weak reference. */ PyObject *gi_weakreflist; } PyGenObject; PyAPI_DATA(PyTypeObject) PyGen_Type; #define PyGen_Check(op) PyObject_TypeCheck(op, &PyGen_Type) #define PyGen_CheckExact(op) ((op)->ob_type == &PyGen_Type) PyAPI_FUNC(PyObject *) PyGen_New(PyFrameObject *); #ifdef __cplusplus } #endif #endif /* !Py_GENOBJECT_H */ Index: ceval.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/ceval.h,v retrieving revision 2.50 retrieving revision 2.51 diff -C2 -d -r2.50 -r2.51 *** ceval.h 28 Oct 2003 12:05:46 -0000 2.50 --- ceval.h 1 Jun 2004 15:22:40 -0000 2.51 *************** *** 65,68 **** --- 65,69 ---- PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); + PyAPI_FUNC(PyObject *) PyEval_EvaluateFrame(PyObject *); /* this used to be handled on a per-thread basis - now just two globals */

1 0

python/dist/src/Modules mmapmodule.c, 2.46, 2.46.6.1
by akuchling＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11696 Modified Files: Tag: release23-maint mmapmodule.c Log Message: Set data pointer to NULL after an error; this keeps the mmap_dealloc() function from trying to do msync(-1);munmap(-1). Index: mmapmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/mmapmodule.c,v retrieving revision 2.46 retrieving revision 2.46.6.1 diff -C2 -d -r2.46 -r2.46.6.1 *** mmapmodule.c 15 Jul 2003 12:37:46 -0000 2.46 --- mmapmodule.c 1 Jun 2004 13:00:16 -0000 2.46.6.1 *************** *** 918,921 **** --- 918,922 ---- fd, 0); if (m_obj->data == (char *)-1) { + m_obj->data = NULL; Py_DECREF(m_obj); PyErr_SetFromErrno(mmap_module_error);

1 0

python/dist/src/Lib/test test_sax.py, 1.24.16.1, 1.24.16.2
by akuchling＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10984 Modified Files: Tag: release23-maint test_sax.py Log Message: [Bug #962631] Fix typo reported by Bryan Blackburn Index: test_sax.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sax.py,v retrieving revision 1.24.16.1 retrieving revision 1.24.16.2 diff -C2 -d -r1.24.16.1 -r1.24.16.2 *** test_sax.py 20 Mar 2004 08:20:03 -0000 1.24.16.1 --- test_sax.py 1 Jun 2004 12:58:18 -0000 1.24.16.2 *************** *** 28,32 **** if outcome: if verbose: ! print "Failed", name else: failures.append(name) --- 28,32 ---- if outcome: if verbose: ! print "Passed", name else: failures.append(name)

1 0

python/dist/src/Lib/test test_sax.py,1.25,1.26
by akuchling＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9250 Modified Files: test_sax.py Log Message: [Bug #962631] Fix typo reported by Bryan Blackburn Index: test_sax.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sax.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** test_sax.py 20 Mar 2004 08:15:29 -0000 1.25 --- test_sax.py 1 Jun 2004 12:48:19 -0000 1.26 *************** *** 28,32 **** if outcome: if verbose: ! print "Failed", name else: failures.append(name) --- 28,32 ---- if outcome: if verbose: ! print "Passed", name else: failures.append(name)

1 0

python/dist/src/Misc NEWS,1.979,1.980
by rhettinger＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4903/Misc Modified Files: NEWS Log Message: SF bug #942952: Weakness in tuple hash (Basic approach and test concept by Tim Peters.) * Improved the hash to reduce collisions. * Added the torture test to the test suite. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.979 retrieving revision 1.980 diff -C2 -d -r1.979 -r1.980 *** NEWS 31 May 2004 19:27:59 -0000 1.979 --- NEWS 1 Jun 2004 06:36:23 -0000 1.980 *************** *** 13,16 **** --- 13,19 ---- ----------------- + - Improved the tuple hashing algorithm to give fewer collisions in + common cases. Fixes bug #942952. + - Implemented generator expressions (PEP 289). Coded by Jiwon Seo.

1 0

python/dist/src/Lib/test test_tuple.py,1.2,1.3
by rhettinger＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4903/Lib/test Modified Files: test_tuple.py Log Message: SF bug #942952: Weakness in tuple hash (Basic approach and test concept by Tim Peters.) * Improved the hash to reduce collisions. * Added the torture test to the test suite. Index: test_tuple.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tuple.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_tuple.py 18 Jan 2004 21:03:23 -0000 1.2 --- test_tuple.py 1 Jun 2004 06:36:24 -0000 1.3 *************** *** 42,45 **** --- 42,64 ---- self.assertEqual(list(tuple(f())), range(1000)) + def test_hash(self): + # See SF bug 942952: Weakness in tuple hash + # The hash should: + # be non-commutative + # should spread-out closely spaced values + # should not exhibit cancellation in tuples like (x,(x,y)) + # should be distinct from element hashes: hash(x)!=hash((x,)) + # This test exercises those cases. + # For a pure random hash and N=50, the expected number of collisions + # is 7.3. Here we allow twice that number. + # Any worse and the hash function is sorely suspect. + + N=50 + base = range(N) + xp = [(i, j) for i in base for j in base] + inps = base + [(i, j) for i in base for j in xp] + \ + [(i, j) for i in xp for j in base] + xp + zip(base) + collisions = len(inps) - len(set(map(hash, inps))) + self.assert_(collisions <= 15) def test_main():

1 0

python/dist/src/Objects tupleobject.c,2.90,2.91
by rhettinger＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4903/Objects Modified Files: tupleobject.c Log Message: SF bug #942952: Weakness in tuple hash (Basic approach and test concept by Tim Peters.) * Improved the hash to reduce collisions. * Added the torture test to the test suite. Index: tupleobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/tupleobject.c,v retrieving revision 2.90 retrieving revision 2.91 diff -C2 -d -r2.90 -r2.91 *** tupleobject.c 21 Mar 2004 22:29:05 -0000 2.90 --- tupleobject.c 1 Jun 2004 06:36:24 -0000 2.91 *************** *** 263,266 **** --- 263,267 ---- register int len = v->ob_size; register PyObject **p; + long mult = 1000003L; x = 0x345678L; p = v->ob_item; *************** *** 269,275 **** if (y == -1) return -1; ! x = (1000003*x) ^ y; } - x ^= v->ob_size; if (x == -1) x = -2; --- 270,276 ---- if (y == -1) return -1; ! x = (x ^ y) * mult; ! mult += 69068L + len + len; } if (x == -1) x = -2;

1 0

python/dist/src/Lib cookielib.py,1.1,1.2
by loewis＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22544 Modified Files: cookielib.py Log Message: Silence noise in regrtest. Index: cookielib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cookielib.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cookielib.py 31 May 2004 18:22:40 -0000 1.1 --- cookielib.py 1 Jun 2004 04:36:51 -0000 1.2 *************** *** 35,39 **** from calendar import timegm - logging.getLogger("cookielib").addHandler(logging.StreamHandler()) debug = logging.getLogger("cookielib").debug --- 35,38 ----

1 0