Mailman 3 August 2006 - Python-checkins

r51403 - python/trunk/Objects/listobject.c
by neal.norwitz 19 Aug '06

19 Aug '06

Author: neal.norwitz Date: Sat Aug 19 06:28:55 2006 New Revision: 51403 Modified: python/trunk/Objects/listobject.c Log: Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) Modified: python/trunk/Objects/listobject.c ============================================================================== --- python/trunk/Objects/listobject.c (original) +++ python/trunk/Objects/listobject.c Sat Aug 19 06:28:55 2006 @@ -1398,7 +1398,7 @@ PyObject *compare; PyObject **dest; int result = -1; /* guilty until proved innocent */ - Py_ssize_t min_gallop = ms->min_gallop; + Py_ssize_t min_gallop; assert(ms && pa && pb && na > 0 && nb > 0 && pa + na == pb); if (MERGE_GETMEM(ms, na) < 0) @@ -1414,6 +1414,7 @@ if (na == 1) goto CopyB; + min_gallop = ms->min_gallop; compare = ms->compare; for (;;) { Py_ssize_t acount = 0; /* # of times A won in a row */ @@ -1531,7 +1532,7 @@ int result = -1; /* guilty until proved innocent */ PyObject **basea; PyObject **baseb; - Py_ssize_t min_gallop = ms->min_gallop; + Py_ssize_t min_gallop; assert(ms && pa && pb && na > 0 && nb > 0 && pa + na == pb); if (MERGE_GETMEM(ms, nb) < 0) @@ -1550,6 +1551,7 @@ if (nb == 1) goto CopyA; + min_gallop = ms->min_gallop; compare = ms->compare; for (;;) { Py_ssize_t acount = 0; /* # of times A won in a row */

1 0

r51402 - in python/trunk: Include/import.h Misc/NEWS
by neal.norwitz 19 Aug '06

19 Aug '06

Author: neal.norwitz Date: Sat Aug 19 06:25:29 2006 New Revision: 51402 Modified: python/trunk/Include/import.h python/trunk/Misc/NEWS Log: SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro Modified: python/trunk/Include/import.h ============================================================================== --- python/trunk/Include/import.h (original) +++ python/trunk/Include/import.h Sat Aug 19 06:25:29 2006 @@ -22,7 +22,7 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleEx( char *name, PyObject *globals, PyObject *locals, PyObject *fromlist); #define PyImport_ImportModuleEx(n, g, l, f) \ - PyImport_ImportModuleLevel(n, g, l, f, -1); + PyImport_ImportModuleLevel(n, g, l, f, -1) PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name); PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m); Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sat Aug 19 06:25:29 2006 @@ -43,6 +43,9 @@ C API ----- +- Bug #1542693: remove semi-colon at end of PyImport_ImportModuleEx macro + so it can be used as an expression. + Mac --- @@ -211,10 +214,6 @@ is always 1 (normal) or 0 (if the specified thread wasn't found). -Mac ---- - - What's New in Python 2.5 beta 3? ================================

1 0

r51401 - python/trunk/Modules/_ctypes/stgdict.c
by neal.norwitz 19 Aug '06

19 Aug '06

Author: neal.norwitz Date: Sat Aug 19 06:23:04 2006 New Revision: 51401 Modified: python/trunk/Modules/_ctypes/stgdict.c Log: Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 Modified: python/trunk/Modules/_ctypes/stgdict.c ============================================================================== --- python/trunk/Modules/_ctypes/stgdict.c (original) +++ python/trunk/Modules/_ctypes/stgdict.c Sat Aug 19 06:23:04 2006 @@ -208,12 +208,12 @@ continue; } new_descr = (CFieldObject *)PyObject_CallObject((PyObject *)&CField_Type, NULL); - assert(new_descr->ob_type == &CField_Type); if (new_descr == NULL) { Py_DECREF(fdescr); Py_DECREF(fieldlist); return -1; } + assert(new_descr->ob_type == &CField_Type); new_descr->size = fdescr->size; new_descr->offset = fdescr->offset + offset; new_descr->index = fdescr->index + index;

1 0

r51400 - python/trunk/Objects/classobject.c
by neal.norwitz 19 Aug '06

19 Aug '06

Author: neal.norwitz Date: Sat Aug 19 06:22:33 2006 New Revision: 51400 Modified: python/trunk/Objects/classobject.c Log: Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 Modified: python/trunk/Objects/classobject.c ============================================================================== --- python/trunk/Objects/classobject.c (original) +++ python/trunk/Objects/classobject.c Sat Aug 19 06:22:33 2006 @@ -91,8 +91,22 @@ } Py_INCREF(bases); } + + if (getattrstr == NULL) { + getattrstr = PyString_InternFromString("__getattr__"); + if (getattrstr == NULL) + goto alloc_error; + setattrstr = PyString_InternFromString("__setattr__"); + if (setattrstr == NULL) + goto alloc_error; + delattrstr = PyString_InternFromString("__delattr__"); + if (delattrstr == NULL) + goto alloc_error; + } + op = PyObject_GC_New(PyClassObject, &PyClass_Type); if (op == NULL) { +alloc_error: Py_DECREF(bases); return NULL; } @@ -101,17 +115,7 @@ op->cl_dict = dict; Py_XINCREF(name); op->cl_name = name; - if (getattrstr == NULL) { - getattrstr = PyString_InternFromString("__getattr__"); - if (getattrstr == NULL) - return NULL; - setattrstr = PyString_InternFromString("__setattr__"); - if (setattrstr == NULL) - return NULL; - delattrstr = PyString_InternFromString("__delattr__"); - if (delattrstr == NULL) - return NULL; - } + op->cl_getattr = class_lookup(op, getattrstr, &dummy); op->cl_setattr = class_lookup(op, setattrstr, &dummy); op->cl_delattr = class_lookup(op, delattrstr, &dummy);

1 0

r51399 - in python/branches/release25-maint: Include/import.h Misc/NEWS
by neal.norwitz 19 Aug '06

19 Aug '06

Author: neal.norwitz Date: Sat Aug 19 06:19:43 2006 New Revision: 51399 Modified: python/branches/release25-maint/Include/import.h python/branches/release25-maint/Misc/NEWS Log: SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro Modified: python/branches/release25-maint/Include/import.h ============================================================================== --- python/branches/release25-maint/Include/import.h (original) +++ python/branches/release25-maint/Include/import.h Sat Aug 19 06:19:43 2006 @@ -22,7 +22,7 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleEx( char *name, PyObject *globals, PyObject *locals, PyObject *fromlist); #define PyImport_ImportModuleEx(n, g, l, f) \ - PyImport_ImportModuleLevel(n, g, l, f, -1); + PyImport_ImportModuleLevel(n, g, l, f, -1) PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name); PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m); Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Sat Aug 19 06:19:43 2006 @@ -30,6 +30,13 @@ - Fix OpenSSL debug build process. +C API +----- + +- Bug #1542693: remove semi-colon at end of PyImport_ImportModuleEx macro + so it can be used as an expression. + + What's New in Python 2.5 release candidate 1? ============================================= @@ -193,10 +200,6 @@ is always 1 (normal) or 0 (if the specified thread wasn't found). -Mac ---- - - What's New in Python 2.5 beta 3? ================================

1 0

r51398 - python/branches/release25-maint/Objects/classobject.c
by neal.norwitz 19 Aug '06

19 Aug '06

Author: neal.norwitz Date: Sat Aug 19 06:19:14 2006 New Revision: 51398 Modified: python/branches/release25-maint/Objects/classobject.c Log: Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 Modified: python/branches/release25-maint/Objects/classobject.c ============================================================================== --- python/branches/release25-maint/Objects/classobject.c (original) +++ python/branches/release25-maint/Objects/classobject.c Sat Aug 19 06:19:14 2006 @@ -91,8 +91,22 @@ } Py_INCREF(bases); } + + if (getattrstr == NULL) { + getattrstr = PyString_InternFromString("__getattr__"); + if (getattrstr == NULL) + goto alloc_error; + setattrstr = PyString_InternFromString("__setattr__"); + if (setattrstr == NULL) + goto alloc_error; + delattrstr = PyString_InternFromString("__delattr__"); + if (delattrstr == NULL) + goto alloc_error; + } + op = PyObject_GC_New(PyClassObject, &PyClass_Type); if (op == NULL) { +alloc_error: Py_DECREF(bases); return NULL; } @@ -101,17 +115,7 @@ op->cl_dict = dict; Py_XINCREF(name); op->cl_name = name; - if (getattrstr == NULL) { - getattrstr = PyString_InternFromString("__getattr__"); - if (getattrstr == NULL) - return NULL; - setattrstr = PyString_InternFromString("__setattr__"); - if (setattrstr == NULL) - return NULL; - delattrstr = PyString_InternFromString("__delattr__"); - if (delattrstr == NULL) - return NULL; - } + op->cl_getattr = class_lookup(op, getattrstr, &dummy); op->cl_setattr = class_lookup(op, setattrstr, &dummy); op->cl_delattr = class_lookup(op, delattrstr, &dummy);

1 0

r51397 - python/branches/release25-maint/Modules/_ctypes/stgdict.c
by neal.norwitz 19 Aug '06

19 Aug '06

Author: neal.norwitz Date: Sat Aug 19 06:18:39 2006 New Revision: 51397 Modified: python/branches/release25-maint/Modules/_ctypes/stgdict.c Log: Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 Modified: python/branches/release25-maint/Modules/_ctypes/stgdict.c ============================================================================== --- python/branches/release25-maint/Modules/_ctypes/stgdict.c (original) +++ python/branches/release25-maint/Modules/_ctypes/stgdict.c Sat Aug 19 06:18:39 2006 @@ -208,12 +208,12 @@ continue; } new_descr = (CFieldObject *)PyObject_CallObject((PyObject *)&CField_Type, NULL); - assert(new_descr->ob_type == &CField_Type); if (new_descr == NULL) { Py_DECREF(fdescr); Py_DECREF(fieldlist); return -1; } + assert(new_descr->ob_type == &CField_Type); new_descr->size = fdescr->size; new_descr->offset = fdescr->offset + offset; new_descr->index = fdescr->index + index;

1 0

r51393 - python/branches/bcannon-objcap/BRANCHNEWS
by brett.cannon 18 Aug '06

18 Aug '06

Author: brett.cannon Date: Sat Aug 19 01:58:13 2006 New Revision: 51393 Modified: python/branches/bcannon-objcap/BRANCHNEWS Log: Add entry for objcap and object.__subclasses__(). Modified: python/branches/bcannon-objcap/BRANCHNEWS ============================================================================== --- python/branches/bcannon-objcap/BRANCHNEWS (original) +++ python/branches/bcannon-objcap/BRANCHNEWS Sat Aug 19 01:58:13 2006 @@ -5,3 +5,5 @@ Core and builtins ----------------- +* rev. 51392: Introduce objcap module to hold removed functions/methods. Begin + with moving object.__subclasses__().

1 0

r51392 - in python/branches/bcannon-objcap: Lib/test/test_descr.py Lib/test/test_objcap.py Modules/objcapmodule.c Objects/typeobject.c setup.py
by brett.cannon 18 Aug '06

18 Aug '06

Author: brett.cannon Date: Sat Aug 19 01:55:41 2006 New Revision: 51392 Added: python/branches/bcannon-objcap/Lib/test/test_objcap.py (contents, props changed) python/branches/bcannon-objcap/Modules/objcapmodule.c (contents, props changed) Modified: python/branches/bcannon-objcap/Lib/test/test_descr.py python/branches/bcannon-objcap/Objects/typeobject.c python/branches/bcannon-objcap/setup.py Log: Introduce objcap module to store removed abilities. Begin with moving object.__subclasses__(). Modified: python/branches/bcannon-objcap/Lib/test/test_descr.py ============================================================================== --- python/branches/bcannon-objcap/Lib/test/test_descr.py (original) +++ python/branches/bcannon-objcap/Lib/test/test_descr.py Sat Aug 19 01:55:41 2006 @@ -3595,7 +3595,6 @@ vereq(e.meth(), 1) vereq(d.a, 2) vereq(e.a, 2) - vereq(C2.__subclasses__(), [D]) # stuff that shouldn't: class L(list): Added: python/branches/bcannon-objcap/Lib/test/test_objcap.py ============================================================================== --- (empty file) +++ python/branches/bcannon-objcap/Lib/test/test_objcap.py Sat Aug 19 01:55:41 2006 @@ -0,0 +1,33 @@ +import objcap +import unittest +from test import test_support + +class TestClass(object): + pass + +class ObjectSubclasses(unittest.TestCase): + + """Test object.__subclasses__() move.""" + + def test_removal(self): + # Make sure __subclasses__ is no longer on 'object'. + self.failUnless(not hasattr(object, '__subclasses__')) + + def test_argument(self): + # Make sure only proper arguments are accepted. + self.failUnlessRaises(TypeError, objcap.subclasses, object()) + + def test_result(self): + # Check return values. + self.failUnlessEqual(objcap.subclasses(TestClass), []) + self.failUnless(objcap.subclasses(object)) + + +def test_main(): + test_support.run_unittest( + ObjectSubclasses + ) + + +if __name__ == '__main__': + test_main() Added: python/branches/bcannon-objcap/Modules/objcapmodule.c ============================================================================== --- (empty file) +++ python/branches/bcannon-objcap/Modules/objcapmodule.c Sat Aug 19 01:55:41 2006 @@ -0,0 +1,70 @@ +/* + Store changes done to implement object-capabilities. +*/ + +#include "Python.h" + +PyDoc_STRVAR(module_doc, +"XXX Placeholder for code removed for object-capabilities reasons.\n\ +"); + + +/* + Return the subclasses of a class. + + Moved so that object does not expose *all* new-style classes to *every* + interpreter. Otherwise would invert direction of knowledge about + inheritance tree. +*/ +static PyObject * +object_subclasses(PyObject* self, PyTypeObject *type) +{ + PyObject *list, *raw, *ref; + Py_ssize_t i, n; + + if (!PyType_Check(type)) { + PyErr_SetString(PyExc_TypeError, + "argument must be a type or subclass thereof"); + return NULL; + } + list = PyList_New(0); + if (list == NULL) + return NULL; + raw = type->tp_subclasses; + if (raw == NULL) + return list; + assert(PyList_Check(raw)); + n = PyList_GET_SIZE(raw); + for (i = 0; i < n; i++) { + ref = PyList_GET_ITEM(raw, i); + assert(PyWeakref_CheckRef(ref)); + ref = PyWeakref_GET_OBJECT(ref); + if (ref != Py_None) { + if (PyList_Append(list, ref) < 0) { + Py_DECREF(list); + return NULL; + } + } + } + return list; +} + +PyDoc_STRVAR(object_subclass_doc, +"subclasses(object) -> return a list of subclasses.\n\ +Originally object.__subclasses__()."); + + +static PyMethodDef module_methods[] = { + {"subclasses", (PyCFunction)object_subclasses, METH_O, "XXX"}, + {NULL, NULL} +}; + +PyMODINIT_FUNC +initobjcap(void) +{ + PyObject *module; + + module = Py_InitModule3("objcap", module_methods, module_doc); + if (!module) + return; +} Modified: python/branches/bcannon-objcap/Objects/typeobject.c ============================================================================== --- python/branches/bcannon-objcap/Objects/typeobject.c (original) +++ python/branches/bcannon-objcap/Objects/typeobject.c Sat Aug 19 01:55:41 2006 @@ -2151,39 +2151,10 @@ type->ob_type->tp_free((PyObject *)type); } -static PyObject * -type_subclasses(PyTypeObject *type, PyObject *args_ignored) -{ - PyObject *list, *raw, *ref; - Py_ssize_t i, n; - - list = PyList_New(0); - if (list == NULL) - return NULL; - raw = type->tp_subclasses; - if (raw == NULL) - return list; - assert(PyList_Check(raw)); - n = PyList_GET_SIZE(raw); - for (i = 0; i < n; i++) { - ref = PyList_GET_ITEM(raw, i); - assert(PyWeakref_CheckRef(ref)); - ref = PyWeakref_GET_OBJECT(ref); - if (ref != Py_None) { - if (PyList_Append(list, ref) < 0) { - Py_DECREF(list); - return NULL; - } - } - } - return list; -} static PyMethodDef type_methods[] = { {"mro", (PyCFunction)mro_external, METH_NOARGS, PyDoc_STR("mro() -> list\nreturn a type's method resolution order")}, - {"__subclasses__", (PyCFunction)type_subclasses, METH_NOARGS, - PyDoc_STR("__subclasses__() -> list of immediate subclasses")}, {0} }; Modified: python/branches/bcannon-objcap/setup.py ============================================================================== --- python/branches/bcannon-objcap/setup.py (original) +++ python/branches/bcannon-objcap/setup.py Sat Aug 19 01:55:41 2006 @@ -349,6 +349,8 @@ # Some modules that are normally always on: exts.append( Extension('_weakref', ['_weakref.c']) ) + exts.append(Extension('objcap', ['objcapmodule.c'])) + # array objects exts.append( Extension('array', ['arraymodule.c']) ) # complex math library functions

1 0