Mailman 3 October 2003 - Python-checkins

python/dist/src/Python ceval.c, 2.368, 2.369 errors.c, 2.79, 2.80
by arigo＠users.sourceforge.net 25 Oct '03

25 Oct '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv20980 Modified Files: ceval.c errors.c Log Message: Made function declaration a proper C prototype Index: ceval.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v retrieving revision 2.368 retrieving revision 2.369 diff -C2 -d -r2.368 -r2.369 *** ceval.c 12 Oct 2003 19:09:37 -0000 2.368 --- ceval.c 25 Oct 2003 14:29:27 -0000 2.369 *************** *** 511,514 **** --- 511,537 ---- } + 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; + } + 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; --- 698,704 ---- 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; } } --- 722,726 ---- 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; } } --- 732,736 ---- 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; --- 2436,2441 ---- /* pop frame */ ! exit_eval_frame: ! Py_LeaveRecursiveCall(); tstate->frame = f->f_back; Index: errors.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/errors.c,v retrieving revision 2.79 retrieving revision 2.80 diff -C2 -d -r2.79 -r2.80 *** errors.c 12 Oct 2003 19:09:37 -0000 2.79 --- errors.c 25 Oct 2003 14:29:27 -0000 2.80 *************** *** 600,604 **** } ! extern PyObject *PyModule_GetWarningsModule(); /* Function to issue a warning message; may raise an exception. */ --- 600,604 ---- } ! extern PyObject *PyModule_GetWarningsModule(void); /* Function to issue a warning message; may raise an exception. */

1 0

python/dist/src/Doc/tut tut.tex, 1.196.8.7, 1.196.8.8
by nnorwitz＠users.sourceforge.net 25 Oct '03

25 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/tut In directory sc8-pr-cvs1:/tmp/cvs-serv18604/Doc/tut Modified Files: Tag: release23-maint tut.tex Log Message: SF #829941, update tutorial, built-in types can be base classes since 2.2 Index: tut.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v retrieving revision 1.196.8.7 retrieving revision 1.196.8.8 diff -C2 -d -r1.196.8.7 -r1.196.8.8 *** tut.tex 21 Oct 2003 18:43:15 -0000 1.196.8.7 --- tut.tex 25 Oct 2003 14:17:15 -0000 1.196.8.8 *************** *** 3542,3547 **** in Smalltalk, classes themselves are objects, albeit in the wider sense of the word: in Python, all data types are objects. This ! provides semantics for importing and renaming. But, just like in ! \Cpp{} or Modula-3, built-in types cannot be used as base classes for extension by the user. Also, like in \Cpp{} but unlike in Modula-3, most built-in operators with special syntax (arithmetic operators, --- 3542,3547 ---- in Smalltalk, classes themselves are objects, albeit in the wider sense of the word: in Python, all data types are objects. This ! provides semantics for importing and renaming. Unlike ! \Cpp{} and Modula-3, built-in types can be used as base classes for extension by the user. Also, like in \Cpp{} but unlike in Modula-3, most built-in operators with special syntax (arithmetic operators,

1 0

python/dist/src/Doc/tut tut.tex,1.208,1.209
by nnorwitz＠users.sourceforge.net 25 Oct '03

25 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/tut In directory sc8-pr-cvs1:/tmp/cvs-serv18225/Doc/tut Modified Files: tut.tex Log Message: SF #829941, update tutorial, built-in types can be base classes since 2.2 Index: tut.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v retrieving revision 1.208 retrieving revision 1.209 diff -C2 -d -r1.208 -r1.209 *** tut.tex 21 Oct 2003 18:42:21 -0000 1.208 --- tut.tex 25 Oct 2003 14:15:54 -0000 1.209 *************** *** 3551,3556 **** in Smalltalk, classes themselves are objects, albeit in the wider sense of the word: in Python, all data types are objects. This ! provides semantics for importing and renaming. But, just like in ! \Cpp{} or Modula-3, built-in types cannot be used as base classes for extension by the user. Also, like in \Cpp{} but unlike in Modula-3, most built-in operators with special syntax (arithmetic operators, --- 3551,3556 ---- in Smalltalk, classes themselves are objects, albeit in the wider sense of the word: in Python, all data types are objects. This ! provides semantics for importing and renaming. Unlike ! \Cpp{} and Modula-3, built-in types can be used as base classes for extension by the user. Also, like in \Cpp{} but unlike in Modula-3, most built-in operators with special syntax (arithmetic operators,

1 0

python/dist/src/Misc NEWS,1.876,1.877
by aleax＠users.sourceforge.net 25 Oct '03

25 Oct '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv5132 Modified Files: NEWS Log Message: document the performance fix to builtin_sum(). Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.876 retrieving revision 1.877 diff -C2 -d -r1.876 -r1.877 *** NEWS 24 Oct 2003 08:45:22 -0000 1.876 --- NEWS 25 Oct 2003 13:02:57 -0000 1.877 *************** *** 24,27 **** --- 24,30 ---- records with equal keys is unchanged). + - Added a list.copysort() method that returns a copy of the sorted list + while leaving the original intact. + - Added test whether wchar_t is signed or not. A signed wchar_t is not usable as internal unicode type base for Py_UNICODE since the *************** *** 44,47 **** --- 47,53 ---- - obj.__contains__() now returns True/False instead of 1/0. SF patch 820195. + + - builtin_sum() now uses PyNumber_InPlaceAdd, fixing a previous + performance bug for sum(list_of_lists) and similar cases. Extension modules

1 0

python/dist/src/Misc NEWS,1.831.4.65,1.831.4.66
by aleax＠users.sourceforge.net 25 Oct '03

25 Oct '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv5008 Modified Files: Tag: release23-maint NEWS Log Message: document the performance fix to builtin_sum(). Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.65 retrieving revision 1.831.4.66 diff -C2 -d -r1.831.4.65 -r1.831.4.66 *** NEWS 23 Oct 2003 15:55:03 -0000 1.831.4.65 --- NEWS 25 Oct 2003 13:02:24 -0000 1.831.4.66 *************** *** 16,19 **** --- 16,22 ---- of 1 or 0. + - builtin_sum() now uses PyNumber_InPlaceAdd, fixing a previous + performance bug for sum(list_of_lists) and similar cases. + Extension modules -----------------

1 0

python/dist/src/Python bltinmodule.c,2.299,2.300
by aleax＠users.sourceforge.net 25 Oct '03

25 Oct '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv2818 Modified Files: bltinmodule.c Log Message: Changed builtin_sum to use PyNumber_InPlaceAdd (same semantics, but fixes a performance bug in sum(manylists)), same as in 2.3 maintenance branch. Index: bltinmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v retrieving revision 2.299 retrieving revision 2.300 diff -C2 -d -r2.299 -r2.300 *** bltinmodule.c 25 Oct 2003 06:41:37 -0000 2.299 --- bltinmodule.c 25 Oct 2003 12:49:56 -0000 2.300 *************** *** 1841,1845 **** break; } ! temp = PyNumber_Add(result, item); Py_DECREF(result); Py_DECREF(item); --- 1841,1845 ---- break; } ! temp = PyNumber_InPlaceAdd(result, item); Py_DECREF(result); Py_DECREF(item);

1 0

python/dist/src/Python bltinmodule.c,2.298,2.299
by rhettinger＠users.sourceforge.net 25 Oct '03

25 Oct '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv18167 Modified Files: bltinmodule.c Log Message: Use PyArg_UnpackTuple() where possible. Index: bltinmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v retrieving revision 2.298 retrieving revision 2.299 diff -C2 -d -r2.298 -r2.299 *** bltinmodule.c 12 Oct 2003 19:09:37 -0000 2.298 --- bltinmodule.c 25 Oct 2003 06:41:37 -0000 2.299 *************** *** 1807,1811 **** PyObject *temp, *item, *iter; ! if (!PyArg_ParseTuple(args, "O|O:sum", &seq, &result)) return NULL; --- 1807,1811 ---- PyObject *temp, *item, *iter; ! if (!PyArg_UnpackTuple(args, "sum", 1, 2, &seq, &result)) return NULL;

1 0

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

25 Oct '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv17377 Modified Files: itertoolsmodule.c Log Message: Improvements to coding for itertools.tee(): * Add error checking code to PyList_Append() call. * Replace PyObject_CallMethod(to->outbasket, "pop", NULL) with equivalent in-line code. Inlining is important here because the search for the pop method will occur for every element returned by the iterator. * Make tee's dealloc() a little smarter. If the trailing iterator is being deallocated, then the queue data is no longer needed and can be freed. Index: itertoolsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/itertoolsmodule.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** itertoolsmodule.c 24 Oct 2003 08:45:23 -0000 1.22 --- itertoolsmodule.c 25 Oct 2003 06:37:47 -0000 1.23 *************** *** 47,50 **** --- 47,51 ---- teeobject *to = lz->tee; PyObject *result, *tmp; + int n; if (lz->num_seen == to->num_seen) { *************** *** 54,58 **** return NULL; if (to->save_mode) ! PyList_Append(to->inbasket, result); to->num_seen++; lz->num_seen++; --- 55,62 ---- return NULL; if (to->save_mode) ! if(PyList_Append(to->inbasket, result) == -1){ ! Py_DECREF(result); ! return NULL; ! } to->num_seen++; lz->num_seen++; *************** *** 67,75 **** to->inbasket = tmp; PyList_Reverse(to->outbasket); - assert(PyList_GET_SIZE(to->outbasket) > 0); } lz->num_seen++; ! return PyObject_CallMethod(to->outbasket, "pop", NULL); } --- 71,87 ---- to->inbasket = tmp; PyList_Reverse(to->outbasket); } + /* Pop result from to->outbasket */ + n = PyList_GET_SIZE(to->outbasket); + assert(n>0); + result = PyList_GET_ITEM(to->outbasket, n-1); + Py_INCREF(result); + if (PyList_SetSlice(to->outbasket, n-1, n, NULL) == -1) { + Py_DECREF(result); + return NULL; + } lz->num_seen++; ! return result; } *************** *** 77,82 **** --- 89,105 ---- ii_dealloc(iiobject *ii) { + teeobject *to = ii->tee; + int n; + PyObject_GC_UnTrack(ii); ii->tee->save_mode = 0; /* Stop saving data */ + if (ii->num_seen < to->num_seen) { + /* It is the trailing iterator being freed; this means + that the stored queue data is no longer needed */ + n = PyList_GET_SIZE(to->inbasket); + PyList_SetSlice(to->inbasket, 0, n, NULL); + n = PyList_GET_SIZE(to->outbasket); + PyList_SetSlice(to->outbasket, 0, n, NULL); + } Py_XDECREF(ii->tee); PyObject_GC_Del(ii);

1 0

python/dist/src/Tools/framer/framer template.py, 1.1, 1.2
by loewis＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Tools/framer/framer In directory sc8-pr-cvs1:/tmp/cvs-serv25282/Tools/framer/framer Modified Files: template.py Log Message: Patch #812378: Normalize white space. Index: template.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/framer/framer/template.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** template.py 5 Aug 2002 18:29:45 -0000 1.1 --- template.py 24 Oct 2003 20:09:23 -0000 1.2 *************** *** 20,31 **** methoddef_def = """\ ! {"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s},""" methoddef_def_doc = """\ ! {"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s, %(DocstringVar)s},""" methoddef_end = """\ ! {NULL, NULL} }; """ --- 20,31 ---- methoddef_def = """\ ! {"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s},""" methoddef_def_doc = """\ ! {"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s, %(DocstringVar)s},""" methoddef_end = """\ ! {NULL, NULL} }; """ *************** *** 44,48 **** memberdef_end = """\ ! {NULL} }; --- 44,48 ---- memberdef_end = """\ ! {NULL} };

1 0

python/dist/src/Lib/distutils sysconfig.py, 1.57, 1.58
by loewis＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/distutils In directory sc8-pr-cvs1:/tmp/cvs-serv25282/Lib/distutils Modified Files: sysconfig.py Log Message: Patch #812378: Normalize white space. Index: sysconfig.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** sysconfig.py 10 Feb 2003 14:02:33 -0000 1.57 --- sysconfig.py 24 Oct 2003 20:09:23 -0000 1.58 *************** *** 71,77 **** elif os.name == "mac": if plat_specific: ! return os.path.join(prefix, "Mac", "Include") else: ! return os.path.join(prefix, "Include") elif os.name == "os2": return os.path.join(prefix, "Include") --- 71,77 ---- elif os.name == "mac": if plat_specific: ! return os.path.join(prefix, "Mac", "Include") else: ! return os.path.join(prefix, "Include") elif os.name == "os2": return os.path.join(prefix, "Include") *************** *** 161,165 **** ldshared = ldshared + ' ' + os.environ['LDFLAGS'] if basecflags: ! opt = basecflags + ' ' + opt if os.environ.has_key('CFLAGS'): opt = opt + ' ' + os.environ['CFLAGS'] --- 161,165 ---- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] if basecflags: ! opt = basecflags + ' ' + opt if os.environ.has_key('CFLAGS'): opt = opt + ' ' + os.environ['CFLAGS']

1 0