Mailman 3 October 2003 - Python-checkins

python/nondist/peps pep-0322.txt,1.6,1.7
by rhettinger＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv31368 Modified Files: pep-0322.txt Log Message: Offer the community a choice for a simpler, limited alternative. Index: pep-0322.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0322.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pep-0322.txt 28 Oct 2003 10:16:32 -0000 1.6 --- pep-0322.txt 28 Oct 2003 20:40:56 -0000 1.7 *************** *** 154,157 **** --- 154,167 ---- + Active Alternative + ================== + + A simpler, but limited alternative is to create a builtin called + reverse_range() that takes the same arguments as range() but returns a + reverse iterator over the range. The idea is that much of the benefit + of inreverse() comes reducing the intellectual effort it takes to + express the arguments for [x]range() when going backwards. + + Rejected Alternative ====================

1 0

python/nondist/peps pep-0321.txt,1.2,1.3
by akuchling＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv20002 Modified Files: pep-0321.txt Log Message: Turn paragraph into a list, and add some items Index: pep-0321.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0321.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pep-0321.txt 7 Oct 2003 12:16:04 -0000 1.2 --- pep-0321.txt 28 Oct 2003 19:48:44 -0000 1.3 *************** *** 33,40 **** ======================= ! Useful formats to support include `ISO8601`_, `RFC2822`_, `ctime`_, ! and some that are commonly written by humans such as the American ! "MM/DD/YYYY", the European "YYYY/MM/DD", and variants such as ! "DD-Month-YYYY". XXX The Perl `ParseDate.pm`_ module supports many different input formats, --- 33,45 ---- ======================= ! Useful formats to support include: ! ! * `ISO8601`_ ! * ARPA/`RFC2822`_ ! * `ctime`_ ! * Formats commonly written by humans such as the American ! "MM/DD/YYYY", the European "YYYY/MM/DD", and variants such as ! "DD-Month-YYYY". ! * CVS-style or tar-style dates ("tomorrow", "12 hours ago", etc.) XXX The Perl `ParseDate.pm`_ module supports many different input formats,

1 0

python/nondist/peps pep-0289.txt, 1.10, 1.11 pep-0000.txt, 1.256, 1.257
by rhettinger＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv31304 Modified Files: pep-0289.txt pep-0000.txt Log Message: Mark PEP 289 as accepted. Index: pep-0289.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0289.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pep-0289.txt 24 Oct 2003 01:29:14 -0000 1.10 --- pep-0289.txt 28 Oct 2003 18:06:32 -0000 1.11 *************** *** 4,8 **** Last-Modified: $Date$ Author: python(a)rcn.com (Raymond D. Hettinger) ! Status: Draft Type: Standards Track Content-Type: text/x-rst --- 4,8 ---- Last-Modified: $Date$ Author: python(a)rcn.com (Raymond D. Hettinger) ! Status: Accepted Type: Standards Track Content-Type: text/x-rst *************** *** 75,84 **** =================== ! The previous version of this PEP was REJECTED. The bracketed yield ! syntax left something to be desired; the performance gains had not been ! demonstrated; and the range of use cases had not been shown. After, ! much discussion on the python-dev list, the PEP has been resurrected ! its present form. The impetus for the discussion was an innovative ! proposal from Peter Norvig [3]_. --- 75,79 ---- =================== ! This PEP is ACCEPTED for Py2.4. Index: pep-0000.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v retrieving revision 1.256 retrieving revision 1.257 diff -C2 -d -r1.256 -r1.257 *** pep-0000.txt 28 Oct 2003 10:16:31 -0000 1.256 --- pep-0000.txt 28 Oct 2003 18:06:32 -0000 1.257 *************** *** 63,66 **** --- 63,67 ---- S 252 Making Types Look More Like Classes GvR S 253 Subtyping Built-in Types GvR + SA 289 Generator Expressions Hettinger Open PEPs (under consideration) *************** *** 98,102 **** I 287 reStructuredText Docstring Format Goodger S 288 Generators Attributes and Exceptions Hettinger - S 289 Generator Expressions Hettinger S 292 Simpler String Substitutions Warsaw S 294 Type Names in the types Module Tirosh --- 99,102 ---- *************** *** 306,310 **** I 287 reStructuredText Docstring Format Goodger S 288 Generators Attributes and Exceptions Hettinger ! S 289 Generator Expressions Hettinger I 290 Code Migration and Modernization Hettinger I 291 Backward Compatibility for Standard Library Norwitz --- 306,310 ---- I 287 reStructuredText Docstring Format Goodger S 288 Generators Attributes and Exceptions Hettinger ! SA 289 Generator Expressions Hettinger I 290 Code Migration and Modernization Hettinger I 291 Backward Compatibility for Standard Library Norwitz

1 0

python/dist/src/Misc NEWS,1.879,1.880
by montanaro＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv12494 Modified Files: NEWS Log Message: note db2pickle/pickle2db tweaks Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.879 retrieving revision 1.880 diff -C2 -d -r1.879 -r1.880 *** NEWS 28 Oct 2003 12:05:47 -0000 1.879 --- NEWS 28 Oct 2003 16:24:00 -0000 1.880 *************** *** 144,147 **** --- 144,149 ---- ----------- + - The db2pickle and pickle2db scripts can now dump/load gdbm files. + - The pydoc script will display a link to the module documentation for modules determined to be part of the core distribution. The documentation

1 0

python/dist/src/Tools/scripts db2pickle.py, 1.4, 1.5 pickle2db.py, 1.5, 1.6
by montanaro＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Tools/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv11207 Modified Files: db2pickle.py pickle2db.py Log Message: allow dump/load of gdbm files Index: db2pickle.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/scripts/db2pickle.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db2pickle.py 20 Jun 2003 01:00:20 -0000 1.4 --- db2pickle.py 28 Oct 2003 16:17:54 -0000 1.5 *************** *** 2,6 **** """ ! Synopsis: %(prog)s [-h|-b|-r] dbfile [ picklefile ] Convert the database file given on the command line to a pickle --- 2,6 ---- """ ! Synopsis: %(prog)s [-h|-g|-b|-r|-a] dbfile [ picklefile ] Convert the database file given on the command line to a pickle *************** *** 22,25 **** --- 22,29 ---- dbm = None try: + import gdbm + except ImportError: + gdbm = None + try: import anydbm except ImportError: *************** *** 38,43 **** def main(args): try: ! opts, args = getopt.getopt(args, "hbrda", ! ["hash", "btree", "recno", "dbm", "anydbm"]) except getopt.error: usage() --- 42,48 ---- def main(args): try: ! opts, args = getopt.getopt(args, "hbrdag", ! ["hash", "btree", "recno", "dbm", ! "gdbm", "anydbm"]) except getopt.error: usage() *************** *** 83,86 **** --- 88,97 ---- except AttributeError: sys.stderr.write("anydbm module unavailable.\n") + return 1 + elif opt in ("-g", "--gdbm"): + try: + dbopen = gdbm.open + except AttributeError: + sys.stderr.write("gdbm module unavailable.\n") return 1 elif opt in ("-d", "--dbm"): Index: pickle2db.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/scripts/pickle2db.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pickle2db.py 20 Jun 2003 01:01:19 -0000 1.5 --- pickle2db.py 28 Oct 2003 16:17:54 -0000 1.6 *************** *** 2,6 **** """ ! Synopsis: %(prog)s [-h|-b|-r|-a|-d] dbfile [ picklefile ] Read the given picklefile as a series of key/value pairs and write to a new --- 2,6 ---- """ ! Synopsis: %(prog)s [-h|-b|-g|-r|-a|-d] dbfile [ picklefile ] Read the given picklefile as a series of key/value pairs and write to a new *************** *** 26,29 **** --- 26,33 ---- dbm = None try: + import gdbm + except ImportError: + gdbm = None + try: import anydbm except ImportError: *************** *** 42,47 **** def main(args): try: ! opts, args = getopt.getopt(args, "hbrda", ! ["hash", "btree", "recno", "dbm", "anydbm"]) except getopt.error: usage() --- 46,52 ---- def main(args): try: ! opts, args = getopt.getopt(args, "hbrdag", ! ["hash", "btree", "recno", "dbm", "anydbm", ! "gdbm"]) except getopt.error: usage() *************** *** 87,90 **** --- 92,101 ---- except AttributeError: sys.stderr.write("anydbm module unavailable.\n") + return 1 + elif opt in ("-g", "--gdbm"): + try: + dbopen = gdbm.open + except AttributeError: + sys.stderr.write("gdbm module unavailable.\n") return 1 elif opt in ("-d", "--dbm"):

1 0

python/dist/src/Lib dis.py,1.46,1.47
by arigo＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv32563/Lib Modified Files: dis.py Log Message: Fixed dis.disassemble_string(). Added dis.findlinestarts(). SF bug 811294 Index: dis.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/dis.py,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** dis.py 7 Mar 2003 17:30:45 -0000 1.46 --- dis.py 28 Oct 2003 12:17:25 -0000 1.47 *************** *** 61,79 **** """Disassemble a code object.""" code = co.co_code - - byte_increments = [ord(c) for c in co.co_lnotab[0::2]] - line_increments = [ord(c) for c in co.co_lnotab[1::2]] - table_length = len(byte_increments) # == len(line_increments) - - lineno = co.co_firstlineno - table_index = 0 - while (table_index < table_length - and byte_increments[table_index] == 0): - lineno += line_increments[table_index] - table_index += 1 - addr = 0 - line_incr = 0 - labels = findlabels(code) n = len(code) i = 0 --- 61,66 ---- """Disassemble a code object.""" code = co.co_code labels = findlabels(code) + linestarts = dict(findlinestarts(co)) n = len(code) i = 0 *************** *** 83,100 **** c = code[i] op = ord(c) ! ! if i >= addr: ! lineno += line_incr ! while table_index < table_length: ! addr += byte_increments[table_index] ! line_incr = line_increments[table_index] ! table_index += 1 ! if line_incr: ! break ! else: ! addr = sys.maxint if i > 0: print ! print "%3d"%lineno, else: print ' ', --- 70,77 ---- c = code[i] op = ord(c) ! if i in linestarts: if i > 0: print ! print "%3d" % linestarts[i], else: print ' ', *************** *** 138,143 **** c = code[i] op = ord(c) - if op == opmap['SET_LINENO'] and i > 0: - print # Extra blank line if i == lasti: print '-->', else: print ' ', --- 115,118 ---- *************** *** 200,203 **** --- 175,199 ---- return labels + def findlinestarts(code): + """Find the offsets in a byte code which are start of lines in the source. + + Generate pairs (offset, lineno) as described in Python/compile.c. + + """ + byte_increments = [ord(c) for c in code.co_lnotab[0::2]] + line_increments = [ord(c) for c in code.co_lnotab[1::2]] + + lastlineno = None + lineno = code.co_firstlineno + addr = 0 + for byte_incr, line_incr in zip(byte_increments, line_increments): + if byte_incr: + if lineno != lastlineno: + yield (addr, lineno) + lastlineno = lineno + addr += byte_incr + lineno += line_incr + if lineno != lastlineno: + yield (addr, lineno) def _test():

1 0

python/dist/src/Doc/lib libgc.tex,1.14,1.15
by arigo＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv31501 Modified Files: libgc.tex Log Message: Documented gc.get_referrers() as dangerous. SF bug 793822 Index: libgc.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libgc.tex,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** libgc.tex 8 Apr 2003 17:37:47 -0000 1.14 --- libgc.tex 28 Oct 2003 12:10:38 -0000 1.15 *************** *** 97,100 **** --- 97,105 ---- \function{get_referrers()}. + Care must be taken when using objects returned by + \function{get_referrers()} because some of them could still be under + construction and hence in a temporarily invalid state. Avoid using + \function{get_referrers()} for any purpose other than debugging. + \versionadded{2.2} \end{funcdesc}

1 0

python/dist/src/Python ceval.c,2.370,2.371
by arigo＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv30659/Python Modified Files: ceval.c Log Message: Deleting cyclic object comparison. SF patch 825639 http://mail.python.org/pipermail/python-dev/2003-October/039445.html Index: ceval.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v retrieving revision 2.370 retrieving revision 2.371 diff -C2 -d -r2.370 -r2.371 *** ceval.c 25 Oct 2003 14:33:09 -0000 2.370 --- ceval.c 28 Oct 2003 12:05:48 -0000 2.371 *************** *** 498,501 **** --- 498,502 ---- static int recursion_limit = 1000; + int _Py_CheckRecursionLimit = 1000; int *************** *** 509,514 **** --- 510,545 ---- { recursion_limit = new_limit; + _Py_CheckRecursionLimit = recursion_limit; + } + + /* the macro Py_EnterRecursiveCall() only calls _Py_CheckRecursiveCall() + if the recursion_depth reaches _Py_CheckRecursionLimit. + If USE_STACKCHECK, the macro decrements _Py_CheckRecursionLimit + to guarantee that _Py_CheckRecursiveCall() is regularly called. + Without USE_STACKCHECK, there is no need for this. */ + int + _Py_CheckRecursiveCall(char *where) + { + PyThreadState *tstate = PyThreadState_GET(); + + #ifdef USE_STACKCHECK + if (PyOS_CheckStack()) { + --tstate->recursion_depth; + PyErr_SetString(PyExc_MemoryError, "Stack overflow"); + return -1; + } + #endif + if (tstate->recursion_depth > recursion_limit) { + --tstate->recursion_depth; + PyErr_Format(PyExc_RuntimeError, + "maximum recursion depth exceeded%s", + where); + return -1; + } + _Py_CheckRecursionLimit = recursion_limit; + return 0; } + /* Status code for main loop (reason for stack unwind) */ *************** *** 675,693 **** return NULL; - #ifdef USE_STACKCHECK - if (tstate->recursion_depth%10 == 0 && PyOS_CheckStack()) { - PyErr_SetString(PyExc_MemoryError, "Stack overflow"); - return NULL; - } - #endif - /* push frame */ ! if (++tstate->recursion_depth > recursion_limit) { ! --tstate->recursion_depth; ! PyErr_SetString(PyExc_RuntimeError, ! "maximum recursion depth exceeded"); ! tstate->frame = f->f_back; return NULL; - } tstate->frame = f; --- 706,712 ---- return NULL; /* push frame */ ! if (Py_EnterRecursiveCall("")) return NULL; tstate->frame = f; *************** *** 711,717 **** f, PyTrace_CALL, Py_None)) { /* Trace function raised an error */ ! --tstate->recursion_depth; ! tstate->frame = f->f_back; ! return NULL; } } --- 730,734 ---- f, PyTrace_CALL, Py_None)) { /* Trace function raised an error */ ! goto exit_eval_frame; } } *************** *** 723,729 **** f, PyTrace_CALL, Py_None)) { /* Profile function raised an error */ ! --tstate->recursion_depth; ! tstate->frame = f->f_back; ! return NULL; } } --- 740,744 ---- f, PyTrace_CALL, Py_None)) { /* Profile function raised an error */ ! goto exit_eval_frame; } } *************** *** 2429,2433 **** /* pop frame */ ! --tstate->recursion_depth; tstate->frame = f->f_back; --- 2444,2449 ---- /* pop frame */ ! exit_eval_frame: ! Py_LeaveRecursiveCall(); tstate->frame = f->f_back;

1 0

python/dist/src/Objects classobject.c, 2.172, 2.173 object.c, 2.210, 2.211
by arigo＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv30659/Objects Modified Files: classobject.c object.c Log Message: Deleting cyclic object comparison. SF patch 825639 http://mail.python.org/pipermail/python-dev/2003-October/039445.html Index: classobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/classobject.c,v retrieving revision 2.172 retrieving revision 2.173 diff -C2 -d -r2.172 -r2.173 *** classobject.c 12 Oct 2003 19:09:37 -0000 2.172 --- classobject.c 28 Oct 2003 12:05:47 -0000 2.173 *************** *** 1971,1975 **** instance_call(PyObject *func, PyObject *arg, PyObject *kw) { - PyThreadState *tstate = PyThreadState_GET(); PyObject *res, *call = PyObject_GetAttrString(func, "__call__"); if (call == NULL) { --- 1971,1974 ---- *************** *** 1991,2002 **** This bounces between instance_call() and PyObject_Call() without ever hitting eval_frame() (which has the main recursion check). */ ! if (tstate->recursion_depth++ > Py_GetRecursionLimit()) { ! PyErr_SetString(PyExc_RuntimeError, ! "maximum __call__ recursion depth exceeded"); res = NULL; } ! else res = PyObject_Call(call, arg, kw); ! tstate->recursion_depth--; Py_DECREF(call); return res; --- 1990,2000 ---- This bounces between instance_call() and PyObject_Call() without ever hitting eval_frame() (which has the main recursion check). */ ! if (Py_EnterRecursiveCall(" in __call__")) { res = NULL; } ! else { res = PyObject_Call(call, arg, kw); ! Py_LeaveRecursiveCall(); ! } Py_DECREF(call); return res; Index: object.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v retrieving revision 2.210 retrieving revision 2.211 diff -C2 -d -r2.210 -r2.211 *** object.c 15 Aug 2003 13:07:46 -0000 2.210 --- object.c 28 Oct 2003 12:05:47 -0000 2.211 *************** *** 741,858 **** } - /* compare_nesting is incremented before calling compare (for - some types) and decremented on exit. If the count exceeds the - nesting limit, enable code to detect circular data structures. - - This is a tunable parameter that should only affect the performance - of comparisons, nothing else. Setting it high makes comparing deeply - nested non-cyclical data structures faster, but makes comparing cyclical - data structures slower. - */ - #define NESTING_LIMIT 20 - - static int compare_nesting = 0; - - static PyObject* - get_inprogress_dict(void) - { - static PyObject *key; - PyObject *tstate_dict, *inprogress; - - if (key == NULL) { - key = PyString_InternFromString("cmp_state"); - if (key == NULL) - return NULL; - } - - tstate_dict = PyThreadState_GetDict(); - if (tstate_dict == NULL) { - PyErr_BadInternalCall(); - return NULL; - } - - inprogress = PyDict_GetItem(tstate_dict, key); - if (inprogress == NULL) { - inprogress = PyDict_New(); - if (inprogress == NULL) - return NULL; - if (PyDict_SetItem(tstate_dict, key, inprogress) == -1) { - Py_DECREF(inprogress); - return NULL; - } - Py_DECREF(inprogress); - } - - return inprogress; - } - - /* If the comparison "v op w" is already in progress in this thread, returns - * a borrowed reference to Py_None (the caller must not decref). - * If it's not already in progress, returns "a token" which must eventually - * be passed to delete_token(). The caller must not decref this either - * (delete_token decrefs it). The token must not survive beyond any point - * where v or w may die. - * If an error occurs (out-of-memory), returns NULL. - */ - static PyObject * - check_recursion(PyObject *v, PyObject *w, int op) - { - PyObject *inprogress; - PyObject *token; - Py_uintptr_t iv = (Py_uintptr_t)v; - Py_uintptr_t iw = (Py_uintptr_t)w; - PyObject *x, *y, *z; - - inprogress = get_inprogress_dict(); - if (inprogress == NULL) - return NULL; - - token = PyTuple_New(3); - if (token == NULL) - return NULL; - - if (iv <= iw) { - PyTuple_SET_ITEM(token, 0, x = PyLong_FromVoidPtr((void *)v)); - PyTuple_SET_ITEM(token, 1, y = PyLong_FromVoidPtr((void *)w)); - if (op >= 0) - op = swapped_op[op]; - } else { - PyTuple_SET_ITEM(token, 0, x = PyLong_FromVoidPtr((void *)w)); - PyTuple_SET_ITEM(token, 1, y = PyLong_FromVoidPtr((void *)v)); - } - PyTuple_SET_ITEM(token, 2, z = PyInt_FromLong((long)op)); - if (x == NULL || y == NULL || z == NULL) { - Py_DECREF(token); - return NULL; - } - - if (PyDict_GetItem(inprogress, token) != NULL) { - Py_DECREF(token); - return Py_None; /* Without INCREF! */ - } - - if (PyDict_SetItem(inprogress, token, token) < 0) { - Py_DECREF(token); - return NULL; - } - - return token; - } - - static void - delete_token(PyObject *token) - { - PyObject *inprogress; - - if (token == NULL || token == Py_None) - return; - inprogress = get_inprogress_dict(); - if (inprogress == NULL) - PyErr_Clear(); - else - PyDict_DelItem(inprogress, token); - Py_DECREF(token); - } - /* Compare v to w. Return -1 if v < w or exception (PyErr_Occurred() true in latter case). --- 741,744 ---- *************** *** 868,877 **** int result; - #if defined(USE_STACKCHECK) - if (PyOS_CheckStack()) { - PyErr_SetString(PyExc_MemoryError, "Stack overflow"); - return -1; - } - #endif if (v == NULL || w == NULL) { PyErr_BadInternalCall(); --- 754,757 ---- *************** *** 881,909 **** return 0; vtp = v->ob_type; ! compare_nesting++; ! if (compare_nesting > NESTING_LIMIT && ! (vtp->tp_as_mapping || vtp->tp_as_sequence) && ! !PyString_CheckExact(v) && ! !PyTuple_CheckExact(v)) { ! /* try to detect circular data structures */ ! PyObject *token = check_recursion(v, w, -1); ! ! if (token == NULL) { ! result = -1; ! } ! else if (token == Py_None) { ! /* already comparing these objects. assume ! they're equal until shown otherwise */ ! result = 0; ! } ! else { ! result = do_cmp(v, w); ! delete_token(token); ! } ! } ! else { ! result = do_cmp(v, w); ! } ! compare_nesting--; return result < 0 ? -1 : result; } --- 761,768 ---- return 0; vtp = v->ob_type; ! if (Py_EnterRecursiveCall(" in cmp")) ! return -1; ! result = do_cmp(v, w); ! Py_LeaveRecursiveCall(); return result < 0 ? -1 : result; } *************** *** 976,1014 **** assert(Py_LT <= op && op <= Py_GE); ! compare_nesting++; ! if (compare_nesting > NESTING_LIMIT && ! (v->ob_type->tp_as_mapping || v->ob_type->tp_as_sequence) && ! !PyString_CheckExact(v) && ! !PyTuple_CheckExact(v)) { ! /* try to detect circular data structures */ ! PyObject *token = check_recursion(v, w, op); ! if (token == NULL) { ! res = NULL; ! goto Done; ! } ! else if (token == Py_None) { ! /* already comparing these objects with this operator. ! assume they're equal until shown otherwise */ ! if (op == Py_EQ) ! res = Py_True; ! else if (op == Py_NE) ! res = Py_False; ! else { ! PyErr_SetString(PyExc_ValueError, ! "can't order recursive values"); ! res = NULL; ! } ! Py_XINCREF(res); ! } ! else { ! res = do_richcmp(v, w, op); ! delete_token(token); ! } ! goto Done; ! } ! ! /* No nesting extremism. ! If the types are equal, and not old-style instances, try to get out cheap (don't bother with coercions etc.). */ if (v->ob_type == w->ob_type && !PyInstance_Check(v)) { --- 835,842 ---- assert(Py_LT <= op && op <= Py_GE); + if (Py_EnterRecursiveCall(" in cmp")) + return NULL; ! /* If the types are equal, and not old-style instances, try to get out cheap (don't bother with coercions etc.). */ if (v->ob_type == w->ob_type && !PyInstance_Check(v)) { *************** *** 1042,1046 **** res = do_richcmp(v, w, op); Done: ! compare_nesting--; return res; } --- 870,874 ---- res = do_richcmp(v, w, op); Done: ! Py_LeaveRecursiveCall(); return res; }

1 0

python/dist/src/Misc NEWS,1.878,1.879
by arigo＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv30659/Misc Modified Files: NEWS Log Message: Deleting cyclic object comparison. SF patch 825639 http://mail.python.org/pipermail/python-dev/2003-October/039445.html Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.878 retrieving revision 1.879 diff -C2 -d -r1.878 -r1.879 *** NEWS 25 Oct 2003 23:24:14 -0000 1.878 --- NEWS 28 Oct 2003 12:05:47 -0000 1.879 *************** *** 48,51 **** --- 48,55 ---- 820195. + - Python no longer tries to be smart about recursive comparisons. + When comparing containers with cyclic references to themselves it + will now just hit the recursion limit. See SF patch 825639. + Extension modules -----------------

1 0