Mailman 3 September 2003 - Python-checkins

python/dist/src/Objects fileobject.c, 2.179.8.2, 2.179.8.3
by rhettinger＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv592/Objects Modified Files: Tag: release23-maint fileobject.c Log Message: Backport Neal's fix for bug #789402 -- a memory leak in fileobject.c Index: fileobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v retrieving revision 2.179.8.2 retrieving revision 2.179.8.3 diff -C2 -d -r2.179.8.2 -r2.179.8.3 *** fileobject.c 7 Sep 2003 20:43:24 -0000 2.179.8.2 --- fileobject.c 16 Sep 2003 05:29:50 -0000 2.179.8.3 *************** *** 100,103 **** --- 100,104 ---- EISDIR, msg); PyErr_SetObject(PyExc_IOError, exc); + Py_XDECREF(exc); return NULL; }

1 0

python/dist/src/Lib/test test___all__.py, 1.34, 1.34.6.1
by rhettinger＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv27701/test Modified Files: Tag: release23-maint test___all__.py Log Message: Backport addition of the __all__ attribute for unittest.py Index: test___all__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test___all__.py,v retrieving revision 1.34 retrieving revision 1.34.6.1 diff -C2 -d -r1.34 -r1.34.6.1 *** test___all__.py 1 Jul 2003 05:49:02 -0000 1.34 --- test___all__.py 16 Sep 2003 04:55:32 -0000 1.34.6.1 *************** *** 60,64 **** self.check_all("Cookie") self.check_all("MimeWriter") ! self.check_all("Queue") self.check_all("SimpleHTTPServer") self.check_all("SocketServer") --- 60,64 ---- self.check_all("Cookie") self.check_all("MimeWriter") ! self.check_all("Queue") self.check_all("SimpleHTTPServer") self.check_all("SocketServer") *************** *** 175,178 **** --- 175,179 ---- self.check_all("traceback") self.check_all("tty") + self.check_all("unittest") self.check_all("urllib") self.check_all("urlparse")

1 0

python/dist/src/Lib unittest.py, 1.24.6.1, 1.24.6.2
by rhettinger＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv27701 Modified Files: Tag: release23-maint unittest.py Log Message: Backport addition of the __all__ attribute for unittest.py Index: unittest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/unittest.py,v retrieving revision 1.24.6.1 retrieving revision 1.24.6.2 diff -C2 -d -r1.24.6.1 -r1.24.6.2 *** unittest.py 13 Sep 2003 02:59:00 -0000 1.24.6.1 --- unittest.py 16 Sep 2003 04:55:32 -0000 1.24.6.2 *************** *** 57,60 **** --- 57,70 ---- ############################################################################## + # Exported classes and functions + ############################################################################## + __all__ = ['TestResult', 'TestCase', 'TestSuite', 'TextTestRunner', + 'TestLoader', 'FunctionTestCase', 'main', 'defaultTestLoader'] + + # Expose obsolete functions for backwards compatability + __all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases']) + + + ############################################################################## # Test framework core ##############################################################################

1 0

python/dist/src/Lib/test test___all__.py, 1.34, 1.35
by rhettinger＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv24044 Modified Files: test___all__.py Log Message: Test __all__ for unittest.py Index: test___all__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test___all__.py,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** test___all__.py 1 Jul 2003 05:49:02 -0000 1.34 --- test___all__.py 16 Sep 2003 04:37:39 -0000 1.35 *************** *** 60,64 **** self.check_all("Cookie") self.check_all("MimeWriter") ! self.check_all("Queue") self.check_all("SimpleHTTPServer") self.check_all("SocketServer") --- 60,64 ---- self.check_all("Cookie") self.check_all("MimeWriter") ! self.check_all("Queue") self.check_all("SimpleHTTPServer") self.check_all("SocketServer") *************** *** 175,178 **** --- 175,179 ---- self.check_all("traceback") self.check_all("tty") + self.check_all("unittest") self.check_all("urllib") self.check_all("urlparse")

1 0

python/dist/src/Misc NEWS,1.831.4.40,1.831.4.41
by rhettinger＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv22699/Misc Modified Files: Tag: release23-maint NEWS Log Message: Backport leak fix for new code objects. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.40 retrieving revision 1.831.4.41 diff -C2 -d -r1.831.4.40 -r1.831.4.41 *** NEWS 12 Sep 2003 16:37:45 -0000 1.831.4.40 --- NEWS 16 Sep 2003 04:36:32 -0000 1.831.4.41 *************** *** 13,16 **** --- 13,18 ---- ----------------- + - Fixed a leak when new code objects are instantiated. + - Bug #800796: slice(1).__hash__() now raises a TypeError, unhashable type.

1 0

python/dist/src/Python compile.c,2.291,2.291.6.1
by rhettinger＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv22699/Python Modified Files: Tag: release23-maint compile.c Log Message: Backport leak fix for new code objects. Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.291 retrieving revision 2.291.6.1 diff -C2 -d -r2.291 -r2.291.6.1 *** compile.c 15 Jul 2003 20:23:26 -0000 2.291 --- compile.c 16 Sep 2003 04:36:33 -0000 2.291.6.1 *************** *** 105,108 **** --- 105,110 ---- int stacksize; int flags; + PyObject *co; + PyObject *empty = NULL; PyObject *code; PyObject *consts; *************** *** 128,146 **** return NULL; - if (freevars == NULL || cellvars == NULL) { - PyObject *empty = PyTuple_New(0); - if (empty == NULL) - return NULL; - if (freevars == NULL) { - freevars = empty; - Py_INCREF(freevars); - } - if (cellvars == NULL) { - cellvars = empty; - Py_INCREF(cellvars); - } - Py_DECREF(empty); - } - if (!PyObject_CheckReadBuffer(code)) { PyErr_SetString(PyExc_TypeError, --- 130,133 ---- *************** *** 149,156 **** } ! return (PyObject *)PyCode_New(argcount, nlocals, stacksize, flags, code, consts, names, varnames, freevars, cellvars, filename, name, ! firstlineno, lnotab); } --- 136,155 ---- } ! if (freevars == NULL || cellvars == NULL) { ! empty = PyTuple_New(0); ! if (empty == NULL) ! return NULL; ! if (freevars == NULL) ! freevars = empty; ! if (cellvars == NULL) ! cellvars = empty; ! } ! ! co = (PyObject *) PyCode_New(argcount, nlocals, stacksize, flags, code, consts, names, varnames, freevars, cellvars, filename, name, ! firstlineno, lnotab); ! Py_XDECREF(empty); ! return co; }

1 0

python/dist/src/Python compile.c,2.293,2.294
by rhettinger＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv19599 Modified Files: compile.c Log Message: Improve the leak fix so that PyTuple_New is only called when needed. Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.293 retrieving revision 2.294 diff -C2 -d -r2.293 -r2.294 *** compile.c 15 Sep 2003 21:43:16 -0000 2.293 --- compile.c 16 Sep 2003 04:27:52 -0000 2.294 *************** *** 106,110 **** int flags; PyObject *co; ! PyObject *empty; PyObject *code; PyObject *consts; --- 106,110 ---- int flags; PyObject *co; ! PyObject *empty = NULL; PyObject *code; PyObject *consts; *************** *** 136,146 **** } ! empty = PyTuple_New(0); ! if (empty == NULL) ! return NULL; ! if (freevars == NULL) ! freevars = empty; ! if (cellvars == NULL) ! cellvars = empty; co = (PyObject *) PyCode_New(argcount, nlocals, stacksize, flags, --- 136,148 ---- } ! if (freevars == NULL || cellvars == NULL) { ! empty = PyTuple_New(0); ! if (empty == NULL) ! return NULL; ! if (freevars == NULL) ! freevars = empty; ! if (cellvars == NULL) ! cellvars = empty; ! } co = (PyObject *) PyCode_New(argcount, nlocals, stacksize, flags, *************** *** 148,152 **** freevars, cellvars, filename, name, firstlineno, lnotab); ! Py_DECREF(empty); return co; } --- 150,154 ---- freevars, cellvars, filename, name, firstlineno, lnotab); ! Py_XDECREF(empty); return co; }

1 0

python/dist/src/Objects unicodeobject.c, 2.195, 2.196
by jhylton＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv12002 Modified Files: unicodeobject.c Log Message: Change checks of PyUnicode_Resize() return value for clarity. The unicode_resize() family only returns -1 or 0 so simply checking for != 0 is sufficient, but somewhat unclear. Many Python API functions return < 0 on error, reserving the right to return 0 or 1 on success. Change the call sites for consistency with these calls. Index: unicodeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v retrieving revision 2.195 retrieving revision 2.196 diff -C2 -d -r2.195 -r2.196 *** unicodeobject.c 27 Aug 2003 04:55:51 -0000 2.195 --- unicodeobject.c 16 Sep 2003 03:41:45 -0000 2.196 *************** *** 190,195 **** /* Keep-Alive optimization: we only upsize the buffer, never downsize it. */ ! if ((unicode->length < length) && ! unicode_resize(unicode, length)) { PyMem_DEL(unicode->str); goto onError; --- 190,195 ---- /* Keep-Alive optimization: we only upsize the buffer, never downsize it. */ ! if ((unicode->length < length) && ! unicode_resize(unicode, length) < 0) { PyMem_DEL(unicode->str); goto onError; *************** *** 251,256 **** } ! int PyUnicode_Resize(PyObject **unicode, ! int length) { register PyUnicodeObject *v; --- 251,255 ---- } ! int PyUnicode_Resize(PyObject **unicode, int length) { register PyUnicodeObject *v; *************** *** 754,758 **** if (requiredsize<2*outsize) requiredsize = 2*outsize; ! if (PyUnicode_Resize(output, requiredsize)) goto onError; *outptr = PyUnicode_AS_UNICODE(*output) + *outpos; --- 753,757 ---- if (requiredsize<2*outsize) requiredsize = 2*outsize; ! if (PyUnicode_Resize(output, requiredsize) < 0) goto onError; *outptr = PyUnicode_AS_UNICODE(*output) + *outpos; *************** *** 950,954 **** } ! if (_PyUnicode_Resize(&unicode, p - PyUnicode_AS_UNICODE(unicode))) goto onError; --- 949,953 ---- } ! if (_PyUnicode_Resize(&unicode, p - PyUnicode_AS_UNICODE(unicode)) < 0) goto onError; *************** *** 1252,1256 **** /* Adjust length */ ! if (_PyUnicode_Resize(&unicode, p - unicode->str)) goto onError; --- 1251,1255 ---- /* Adjust length */ ! if (_PyUnicode_Resize(&unicode, p - unicode->str) < 0) goto onError; *************** *** 1523,1527 **** /* Adjust length */ ! if (_PyUnicode_Resize(&unicode, p - unicode->str)) goto onError; --- 1522,1526 ---- /* Adjust length */ ! if (_PyUnicode_Resize(&unicode, p - unicode->str) < 0) goto onError; *************** *** 1833,1837 **** ; } ! if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v)))) goto onError; Py_XDECREF(errorHandler); --- 1832,1836 ---- ; } ! if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v))) < 0) goto onError; Py_XDECREF(errorHandler); *************** *** 2103,2107 **** ; } ! if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v)))) goto onError; Py_XDECREF(errorHandler); --- 2102,2106 ---- ; } ! if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v))) < 0) goto onError; Py_XDECREF(errorHandler); *************** *** 2539,2543 **** } if (p - PyUnicode_AS_UNICODE(v) < PyString_GET_SIZE(v)) ! if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v)))) goto onError; Py_XDECREF(errorHandler); --- 2538,2542 ---- } if (p - PyUnicode_AS_UNICODE(v) < PyString_GET_SIZE(v)) ! if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v))) < 0) goto onError; Py_XDECREF(errorHandler); *************** *** 2736,2740 **** extrachars += needed; if (_PyUnicode_Resize(&v, ! PyUnicode_GET_SIZE(v) + needed)) { Py_DECREF(x); goto onError; --- 2735,2739 ---- extrachars += needed; if (_PyUnicode_Resize(&v, ! PyUnicode_GET_SIZE(v) + needed) < 0) { Py_DECREF(x); goto onError; *************** *** 2761,2765 **** } if (p - PyUnicode_AS_UNICODE(v) < PyUnicode_GET_SIZE(v)) ! if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v)))) goto onError; Py_XDECREF(errorHandler); --- 2760,2764 ---- } if (p - PyUnicode_AS_UNICODE(v) < PyUnicode_GET_SIZE(v)) ! if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v))) < 0) goto onError; Py_XDECREF(errorHandler); *************** *** 3220,3224 **** if (requiredsize < 2 * *outsize) requiredsize = 2 * *outsize; ! if (_PyUnicode_Resize(outobj, requiredsize)) return -1; *outp = PyUnicode_AS_UNICODE(*outobj) + outpos; --- 3219,3223 ---- if (requiredsize < 2 * *outsize) requiredsize = 2 * *outsize; ! if (_PyUnicode_Resize(outobj, requiredsize) < 0) return -1; *outp = PyUnicode_AS_UNICODE(*outobj) + outpos; *************** *** 3399,3403 **** respos = str-PyUnicode_AS_UNICODE(res); if (respos<ressize) { ! if (_PyUnicode_Resize(&res, respos)) goto onError; } --- 3398,3402 ---- respos = str-PyUnicode_AS_UNICODE(res); if (respos<ressize) { ! if (_PyUnicode_Resize(&res, respos) < 0) goto onError; } *************** *** 3979,3983 **** itemlen = PyUnicode_GET_SIZE(item); while (reslen + itemlen + seplen >= sz) { ! if (_PyUnicode_Resize(&res, sz*2)) { Py_DECREF(item); goto onError; --- 3978,3982 ---- itemlen = PyUnicode_GET_SIZE(item); while (reslen + itemlen + seplen >= sz) { ! if (_PyUnicode_Resize(&res, sz*2) < 0) { Py_DECREF(item); goto onError; *************** *** 3996,4000 **** Py_DECREF(item); } ! if (_PyUnicode_Resize(&res, reslen)) goto onError; --- 3995,3999 ---- Py_DECREF(item); } ! if (_PyUnicode_Resize(&res, reslen) < 0) goto onError; *************** *** 6660,6664 **** } Py_DECREF(uformat); ! if (_PyUnicode_Resize(&result, reslen - rescnt)) goto onError; return (PyObject *)result; --- 6659,6663 ---- } Py_DECREF(uformat); ! if (_PyUnicode_Resize(&result, reslen - rescnt) < 0) goto onError; return (PyObject *)result;

1 0

python/dist/src/Python bltinmodule.c,2.296,2.297
by jhylton＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv7496 Modified Files: bltinmodule.c Log Message: Correct check of PyUnicode_Resize() return value. Index: bltinmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v retrieving revision 2.296 retrieving revision 2.297 diff -C2 -d -r2.296 -r2.297 *** bltinmodule.c 16 Sep 2003 03:10:59 -0000 2.296 --- bltinmodule.c 16 Sep 2003 03:17:16 -0000 2.297 *************** *** 2382,2386 **** if (need < 2 * outlen) need = 2 * outlen; ! if (PyUnicode_Resize(&result, need)) { Py_DECREF(item); goto Fail_1; --- 2382,2387 ---- if (need < 2 * outlen) need = 2 * outlen; ! if (PyUnicode_Resize( ! &result, need) < 0) { Py_DECREF(item); goto Fail_1;

1 0

python/dist/src/Python bltinmodule.c,2.295,2.296
by jhylton＠users.sourceforge.net 16 Sep '03

16 Sep '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv6477 Modified Files: bltinmodule.c Log Message: Reflow long lines and reformat. Index: bltinmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v retrieving revision 2.295 retrieving revision 2.296 diff -C2 -d -r2.295 -r2.296 *** bltinmodule.c 18 Aug 2003 18:28:45 -0000 2.295 --- bltinmodule.c 16 Sep 2003 03:10:59 -0000 2.296 *************** *** 2364,2383 **** int reslen; if (!PyUnicode_Check(item)) { ! PyErr_SetString(PyExc_TypeError, "can't filter unicode to unicode:" ! " __getitem__ returned different type"); Py_DECREF(item); goto Fail_1; } reslen = PyUnicode_GET_SIZE(item); ! if (reslen == 1) { PyUnicode_AS_UNICODE(result)[j++] = PyUnicode_AS_UNICODE(item)[0]; ! } else { /* do we need more space? */ ! int need = j + reslen + len-i-1; if (need > outlen) { ! /* overallocate, to avoid reallocations */ ! if (need<2*outlen) ! need = 2*outlen; if (PyUnicode_Resize(&result, need)) { Py_DECREF(item); --- 2364,2385 ---- int reslen; if (!PyUnicode_Check(item)) { ! PyErr_SetString(PyExc_TypeError, ! "can't filter unicode to unicode:" ! " __getitem__ returned different type"); Py_DECREF(item); goto Fail_1; } reslen = PyUnicode_GET_SIZE(item); ! if (reslen == 1) PyUnicode_AS_UNICODE(result)[j++] = PyUnicode_AS_UNICODE(item)[0]; ! else { /* do we need more space? */ ! int need = j + reslen + len - i - 1; if (need > outlen) { ! /* overallocate, ! to avoid reallocations */ ! if (need < 2 * outlen) ! need = 2 * outlen; if (PyUnicode_Resize(&result, need)) { Py_DECREF(item); *************** *** 2386,2394 **** outlen = need; } ! memcpy( ! PyUnicode_AS_UNICODE(result) + j, ! PyUnicode_AS_UNICODE(item), ! reslen*sizeof(Py_UNICODE) ! ); j += reslen; } --- 2388,2394 ---- outlen = need; } ! memcpy(PyUnicode_AS_UNICODE(result) + j, ! PyUnicode_AS_UNICODE(item), ! reslen*sizeof(Py_UNICODE)); j += reslen; }

1 0