Mailman 3 August 2011 - Python-checkins

cpython (merge 3.2 -> default): Try to fix one of the bigmem tests in test_pickle
by antoine.pitrou 30 Aug '11

30 Aug '11

http://hg.python.org/cpython/rev/596b6c9470b3 changeset: 72144:596b6c9470b3 parent: 72141:d8c73a7d65f8 parent: 72143:942729c61684 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Aug 30 23:39:59 2011 +0200 summary: Try to fix one of the bigmem tests in test_pickle files: Lib/test/pickletester.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1228,11 +1228,16 @@ finally: data = None + # BINUNICODE (protocols 1, 2 and 3) cannot carry more than + # 2**32 - 1 bytes of utf-8 encoded unicode. + @precisionbigmemtest(size=_4G, memuse=1 + character_size, dry_run=False) def test_huge_str_64b(self, size): data = "a" * size try: for proto in protocols: + if proto == 0: + continue with self.assertRaises((ValueError, OverflowError)): self.dumps(data, protocol=proto) finally: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to
by amaury.forgeotdarc 30 Aug '11

30 Aug '11

http://hg.python.org/cpython/rev/4aa00f465b4f changeset: 72142:4aa00f465b4f branch: 2.7 parent: 72138:4c6b1b2d481a user: Amaury Forgeot d'Arc <amauryfa(a)gmail.com> date: Tue Aug 30 21:04:35 2011 +0200 summary: Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to some functions like file.write(). files: Lib/ctypes/test/test_buffers.py | 4 ++++ Misc/NEWS | 3 +++ Modules/_ctypes/_ctypes.c | 6 ++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Lib/ctypes/test/test_buffers.py b/Lib/ctypes/test/test_buffers.py --- a/Lib/ctypes/test/test_buffers.py +++ b/Lib/ctypes/test/test_buffers.py @@ -20,6 +20,10 @@ self.assertEqual(b[::2], "ac") self.assertEqual(b[::5], "a") + def test_buffer_interface(self): + self.assertEqual(len(bytearray(create_string_buffer(0))), 0) + self.assertEqual(len(bytearray(create_string_buffer(1))), 1) + def test_string_conversion(self): b = create_string_buffer(u"abc") self.assertEqual(len(b), 4) # trailing nul char diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -180,6 +180,9 @@ Extension Modules ----------------- +- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to + some functions like file.write(). + - Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper signature. Without this, architectures where sizeof void* != sizeof int are broken. Patch given by Hallvard B Furuseth. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -2576,8 +2576,10 @@ view->ndim = dict->ndim; view->shape = dict->shape; view->itemsize = self->b_size; - for (i = 0; i < view->ndim; ++i) { - view->itemsize /= dict->shape[i]; + if (view->itemsize) { + for (i = 0; i < view->ndim; ++i) { + view->itemsize /= dict->shape[i]; + } } view->strides = NULL; view->suboffsets = NULL; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge from 3.2:
by amaury.forgeotdarc 30 Aug '11

30 Aug '11

http://hg.python.org/cpython/rev/d8c73a7d65f8 changeset: 72141:d8c73a7d65f8 parent: 72137:b5a5bd429580 parent: 72140:5e23532f694d user: Amaury Forgeot d'Arc <amauryfa(a)gmail.com> date: Tue Aug 30 22:07:20 2011 +0200 summary: Merge from 3.2: - Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to file.write() - Issue #11241: subclasses of ctypes.Array can now be subclassed. files: Lib/ctypes/test/test_arrays.py | 52 +++++++++++ Lib/ctypes/test/test_buffers.py | 4 + Misc/NEWS | 5 + Modules/_ctypes/_ctypes.c | 93 ++++++++++---------- 4 files changed, 108 insertions(+), 46 deletions(-) diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py --- a/Lib/ctypes/test/test_arrays.py +++ b/Lib/ctypes/test/test_arrays.py @@ -127,5 +127,57 @@ t2 = my_int * 1 self.assertTrue(t1 is t2) + def test_subclass(self): + class T(Array): + _type_ = c_int + _length_ = 13 + class U(T): + pass + class V(U): + pass + class W(V): + pass + class X(T): + _type_ = c_short + class Y(T): + _length_ = 187 + + for c in [T, U, V, W]: + self.assertEqual(c._type_, c_int) + self.assertEqual(c._length_, 13) + self.assertEqual(c()._type_, c_int) + self.assertEqual(c()._length_, 13) + + self.assertEqual(X._type_, c_short) + self.assertEqual(X._length_, 13) + self.assertEqual(X()._type_, c_short) + self.assertEqual(X()._length_, 13) + + self.assertEqual(Y._type_, c_int) + self.assertEqual(Y._length_, 187) + self.assertEqual(Y()._type_, c_int) + self.assertEqual(Y()._length_, 187) + + def test_bad_subclass(self): + import sys + + with self.assertRaises(AttributeError): + class T(Array): + pass + with self.assertRaises(AttributeError): + class T(Array): + _type_ = c_int + with self.assertRaises(AttributeError): + class T(Array): + _length_ = 13 + with self.assertRaises(OverflowError): + class T(Array): + _type_ = c_int + _length_ = sys.maxsize * 2 + with self.assertRaises(AttributeError): + class T(Array): + _type_ = c_int + _length_ = 1.87 + if __name__ == '__main__': unittest.main() diff --git a/Lib/ctypes/test/test_buffers.py b/Lib/ctypes/test/test_buffers.py --- a/Lib/ctypes/test/test_buffers.py +++ b/Lib/ctypes/test/test_buffers.py @@ -20,6 +20,10 @@ self.assertEqual(b[::2], b"ac") self.assertEqual(b[::5], b"a") + def test_buffer_interface(self): + self.assertEqual(len(bytearray(create_string_buffer(0))), 0) + self.assertEqual(len(bytearray(create_string_buffer(1))), 1) + try: c_wchar except NameError: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1229,6 +1229,11 @@ Extension Modules ----------------- +- Issue #11241: subclasses of ctypes.Array can now be subclassed. + +- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to + some functions like file.write(). + - Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper signature. Without this, architectures where sizeof void* != sizeof int are broken. Patch given by Hallvard B Furuseth. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -1256,49 +1256,57 @@ PyTypeObject *result; StgDictObject *stgdict; StgDictObject *itemdict; - PyObject *proto; - PyObject *typedict; + PyObject *length_attr, *type_attr; long length; int overflow; Py_ssize_t itemsize, itemalign; char buf[32]; - typedict = PyTuple_GetItem(args, 2); - if (!typedict) + /* create the new instance (which is a class, + since we are a metatype!) */ + result = (PyTypeObject *)PyType_Type.tp_new(type, args, kwds); + if (result == NULL) return NULL; - proto = PyDict_GetItemString(typedict, "_length_"); /* Borrowed ref */ - if (!proto || !PyLong_Check(proto)) { + /* Initialize these variables to NULL so that we can simplify error + handling by using Py_XDECREF. */ + stgdict = NULL; + type_attr = NULL; + + length_attr = PyObject_GetAttrString((PyObject *)result, "_length_"); + if (!length_attr || !PyLong_Check(length_attr)) { PyErr_SetString(PyExc_AttributeError, "class must define a '_length_' attribute, " "which must be a positive integer"); - return NULL; - } - length = PyLong_AsLongAndOverflow(proto, &overflow); + Py_XDECREF(length_attr); + goto error; + } + length = PyLong_AsLongAndOverflow(length_attr, &overflow); if (overflow) { PyErr_SetString(PyExc_OverflowError, "The '_length_' attribute is too large"); - return NULL; - } - - proto = PyDict_GetItemString(typedict, "_type_"); /* Borrowed ref */ - if (!proto) { + Py_DECREF(length_attr); + goto error; + } + Py_DECREF(length_attr); + + type_attr = PyObject_GetAttrString((PyObject *)result, "_type_"); + if (!type_attr) { PyErr_SetString(PyExc_AttributeError, "class must define a '_type_' attribute"); - return NULL; + goto error; } stgdict = (StgDictObject *)PyObject_CallObject( (PyObject *)&PyCStgDict_Type, NULL); if (!stgdict) - return NULL; - - itemdict = PyType_stgdict(proto); + goto error; + + itemdict = PyType_stgdict(type_attr); if (!itemdict) { PyErr_SetString(PyExc_TypeError, "_type_ must have storage info"); - Py_DECREF((PyObject *)stgdict); - return NULL; + goto error; } assert(itemdict->format); @@ -1309,16 +1317,12 @@ sprintf(buf, "(%ld)", length); stgdict->format = _ctypes_alloc_format_string(buf, itemdict->format); } - if (stgdict->format == NULL) { - Py_DECREF((PyObject *)stgdict); - return NULL; - } + if (stgdict->format == NULL) + goto error; stgdict->ndim = itemdict->ndim + 1; stgdict->shape = PyMem_Malloc(sizeof(Py_ssize_t *) * stgdict->ndim); - if (stgdict->shape == NULL) { - Py_DECREF((PyObject *)stgdict); - return NULL; - } + if (stgdict->shape == NULL) + goto error; stgdict->shape[0] = length; memmove(&stgdict->shape[1], itemdict->shape, sizeof(Py_ssize_t) * (stgdict->ndim - 1)); @@ -1327,7 +1331,7 @@ if (length * itemsize < 0) { PyErr_SetString(PyExc_OverflowError, "array too large"); - return NULL; + goto error; } itemalign = itemdict->align; @@ -1338,26 +1342,16 @@ stgdict->size = itemsize * length; stgdict->align = itemalign; stgdict->length = length; - Py_INCREF(proto); - stgdict->proto = proto; + stgdict->proto = type_attr; stgdict->paramfunc = &PyCArrayType_paramfunc; /* Arrays are passed as pointers to function calls. */ stgdict->ffi_type_pointer = ffi_type_pointer; - /* create the new instance (which is a class, - since we are a metatype!) */ - result = (PyTypeObject *)PyType_Type.tp_new(type, args, kwds); - if (result == NULL) - return NULL; - /* replace the class dict by our updated spam dict */ - if (-1 == PyDict_Update((PyObject *)stgdict, result->tp_dict)) { - Py_DECREF(result); - Py_DECREF((PyObject *)stgdict); - return NULL; - } + if (-1 == PyDict_Update((PyObject *)stgdict, result->tp_dict)) + goto error; Py_DECREF(result->tp_dict); result->tp_dict = (PyObject *)stgdict; @@ -1366,15 +1360,20 @@ */ if (itemdict->getfunc == _ctypes_get_fielddesc("c")->getfunc) { if (-1 == add_getset(result, CharArray_getsets)) - return NULL; + goto error; #ifdef CTYPES_UNICODE } else if (itemdict->getfunc == _ctypes_get_fielddesc("u")->getfunc) { if (-1 == add_getset(result, WCharArray_getsets)) - return NULL; + goto error; #endif } return (PyObject *)result; +error: + Py_XDECREF((PyObject*)stgdict); + Py_XDECREF(type_attr); + Py_DECREF(result); + return NULL; } PyTypeObject PyCArrayType_Type = { @@ -2488,8 +2487,10 @@ view->ndim = dict->ndim; view->shape = dict->shape; view->itemsize = self->b_size; - for (i = 0; i < view->ndim; ++i) { - view->itemsize /= dict->shape[i]; + if (view->itemsize) { + for (i = 0; i < view->ndim; ++i) { + view->itemsize /= dict->shape[i]; + } } view->strides = NULL; view->suboffsets = NULL; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #11241: subclasses of ctypes.Array can now be subclassed.
by amaury.forgeotdarc 30 Aug '11

30 Aug '11

http://hg.python.org/cpython/rev/5e23532f694d changeset: 72140:5e23532f694d branch: 3.2 user: Amaury Forgeot d'Arc <amauryfa(a)gmail.com> date: Tue Aug 30 22:02:51 2011 +0200 summary: Issue #11241: subclasses of ctypes.Array can now be subclassed. files: Lib/ctypes/test/test_arrays.py | 52 +++++++++++++ Misc/NEWS | 2 + Modules/_ctypes/_ctypes.c | 87 ++++++++++----------- 3 files changed, 97 insertions(+), 44 deletions(-) diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py --- a/Lib/ctypes/test/test_arrays.py +++ b/Lib/ctypes/test/test_arrays.py @@ -127,5 +127,57 @@ t2 = my_int * 1 self.assertTrue(t1 is t2) + def test_subclass(self): + class T(Array): + _type_ = c_int + _length_ = 13 + class U(T): + pass + class V(U): + pass + class W(V): + pass + class X(T): + _type_ = c_short + class Y(T): + _length_ = 187 + + for c in [T, U, V, W]: + self.assertEqual(c._type_, c_int) + self.assertEqual(c._length_, 13) + self.assertEqual(c()._type_, c_int) + self.assertEqual(c()._length_, 13) + + self.assertEqual(X._type_, c_short) + self.assertEqual(X._length_, 13) + self.assertEqual(X()._type_, c_short) + self.assertEqual(X()._length_, 13) + + self.assertEqual(Y._type_, c_int) + self.assertEqual(Y._length_, 187) + self.assertEqual(Y()._type_, c_int) + self.assertEqual(Y()._length_, 187) + + def test_bad_subclass(self): + import sys + + with self.assertRaises(AttributeError): + class T(Array): + pass + with self.assertRaises(AttributeError): + class T(Array): + _type_ = c_int + with self.assertRaises(AttributeError): + class T(Array): + _length_ = 13 + with self.assertRaises(OverflowError): + class T(Array): + _type_ = c_int + _length_ = sys.maxsize * 2 + with self.assertRaises(AttributeError): + class T(Array): + _type_ = c_int + _length_ = 1.87 + if __name__ == '__main__': unittest.main() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -185,6 +185,8 @@ Extension Modules ----------------- +- Issue #11241: subclasses of ctypes.Array can now be subclassed. + - Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to some functions like file.write(). diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -1256,49 +1256,57 @@ PyTypeObject *result; StgDictObject *stgdict; StgDictObject *itemdict; - PyObject *proto; - PyObject *typedict; + PyObject *length_attr, *type_attr; long length; int overflow; Py_ssize_t itemsize, itemalign; char buf[32]; - typedict = PyTuple_GetItem(args, 2); - if (!typedict) + /* create the new instance (which is a class, + since we are a metatype!) */ + result = (PyTypeObject *)PyType_Type.tp_new(type, args, kwds); + if (result == NULL) return NULL; - proto = PyDict_GetItemString(typedict, "_length_"); /* Borrowed ref */ - if (!proto || !PyLong_Check(proto)) { + /* Initialize these variables to NULL so that we can simplify error + handling by using Py_XDECREF. */ + stgdict = NULL; + type_attr = NULL; + + length_attr = PyObject_GetAttrString((PyObject *)result, "_length_"); + if (!length_attr || !PyLong_Check(length_attr)) { PyErr_SetString(PyExc_AttributeError, "class must define a '_length_' attribute, " "which must be a positive integer"); - return NULL; - } - length = PyLong_AsLongAndOverflow(proto, &overflow); + Py_XDECREF(length_attr); + goto error; + } + length = PyLong_AsLongAndOverflow(length_attr, &overflow); if (overflow) { PyErr_SetString(PyExc_OverflowError, "The '_length_' attribute is too large"); - return NULL; - } - - proto = PyDict_GetItemString(typedict, "_type_"); /* Borrowed ref */ - if (!proto) { + Py_DECREF(length_attr); + goto error; + } + Py_DECREF(length_attr); + + type_attr = PyObject_GetAttrString((PyObject *)result, "_type_"); + if (!type_attr) { PyErr_SetString(PyExc_AttributeError, "class must define a '_type_' attribute"); - return NULL; + goto error; } stgdict = (StgDictObject *)PyObject_CallObject( (PyObject *)&PyCStgDict_Type, NULL); if (!stgdict) - return NULL; - - itemdict = PyType_stgdict(proto); + goto error; + + itemdict = PyType_stgdict(type_attr); if (!itemdict) { PyErr_SetString(PyExc_TypeError, "_type_ must have storage info"); - Py_DECREF((PyObject *)stgdict); - return NULL; + goto error; } assert(itemdict->format); @@ -1309,16 +1317,12 @@ sprintf(buf, "(%ld)", length); stgdict->format = _ctypes_alloc_format_string(buf, itemdict->format); } - if (stgdict->format == NULL) { - Py_DECREF((PyObject *)stgdict); - return NULL; - } + if (stgdict->format == NULL) + goto error; stgdict->ndim = itemdict->ndim + 1; stgdict->shape = PyMem_Malloc(sizeof(Py_ssize_t *) * stgdict->ndim); - if (stgdict->shape == NULL) { - Py_DECREF((PyObject *)stgdict); - return NULL; - } + if (stgdict->shape == NULL) + goto error; stgdict->shape[0] = length; memmove(&stgdict->shape[1], itemdict->shape, sizeof(Py_ssize_t) * (stgdict->ndim - 1)); @@ -1327,7 +1331,7 @@ if (length * itemsize < 0) { PyErr_SetString(PyExc_OverflowError, "array too large"); - return NULL; + goto error; } itemalign = itemdict->align; @@ -1338,26 +1342,16 @@ stgdict->size = itemsize * length; stgdict->align = itemalign; stgdict->length = length; - Py_INCREF(proto); - stgdict->proto = proto; + stgdict->proto = type_attr; stgdict->paramfunc = &PyCArrayType_paramfunc; /* Arrays are passed as pointers to function calls. */ stgdict->ffi_type_pointer = ffi_type_pointer; - /* create the new instance (which is a class, - since we are a metatype!) */ - result = (PyTypeObject *)PyType_Type.tp_new(type, args, kwds); - if (result == NULL) - return NULL; - /* replace the class dict by our updated spam dict */ - if (-1 == PyDict_Update((PyObject *)stgdict, result->tp_dict)) { - Py_DECREF(result); - Py_DECREF((PyObject *)stgdict); - return NULL; - } + if (-1 == PyDict_Update((PyObject *)stgdict, result->tp_dict)) + goto error; Py_DECREF(result->tp_dict); result->tp_dict = (PyObject *)stgdict; @@ -1366,15 +1360,20 @@ */ if (itemdict->getfunc == _ctypes_get_fielddesc("c")->getfunc) { if (-1 == add_getset(result, CharArray_getsets)) - return NULL; + goto error; #ifdef CTYPES_UNICODE } else if (itemdict->getfunc == _ctypes_get_fielddesc("u")->getfunc) { if (-1 == add_getset(result, WCharArray_getsets)) - return NULL; + goto error; #endif } return (PyObject *)result; +error: + Py_XDECREF((PyObject*)stgdict); + Py_XDECREF(type_attr); + Py_DECREF(result); + return NULL; } PyTypeObject PyCArrayType_Type = { -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to
by amaury.forgeotdarc 30 Aug '11

30 Aug '11

http://hg.python.org/cpython/rev/5df1609fbd8f changeset: 72139:5df1609fbd8f branch: 3.2 parent: 72133:be4194b9aa5e user: Amaury Forgeot d'Arc <amauryfa(a)gmail.com> date: Tue Aug 30 21:40:20 2011 +0200 summary: Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to some functions like file.write(). files: Lib/ctypes/test/test_buffers.py | 4 ++++ Misc/NEWS | 3 +++ Modules/_ctypes/_ctypes.c | 6 ++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Lib/ctypes/test/test_buffers.py b/Lib/ctypes/test/test_buffers.py --- a/Lib/ctypes/test/test_buffers.py +++ b/Lib/ctypes/test/test_buffers.py @@ -20,6 +20,10 @@ self.assertEqual(b[::2], b"ac") self.assertEqual(b[::5], b"a") + def test_buffer_interface(self): + self.assertEqual(len(bytearray(create_string_buffer(0))), 0) + self.assertEqual(len(bytearray(create_string_buffer(1))), 1) + try: c_wchar except NameError: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -185,6 +185,9 @@ Extension Modules ----------------- +- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to + some functions like file.write(). + - Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper signature. Without this, architectures where sizeof void* != sizeof int are broken. Patch given by Hallvard B Furuseth. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -2488,8 +2488,10 @@ view->ndim = dict->ndim; view->shape = dict->shape; view->itemsize = self->b_size; - for (i = 0; i < view->ndim; ++i) { - view->itemsize /= dict->shape[i]; + if (view->itemsize) { + for (i = 0; i < view->ndim; ++i) { + view->itemsize /= dict->shape[i]; + } } view->strides = NULL; view->suboffsets = NULL; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): added versionadd information for pkgutil.get_data(); thanks to Kyle Monson from
by sandro.tosi 30 Aug '11

30 Aug '11

http://hg.python.org/cpython/rev/4c6b1b2d481a changeset: 72138:4c6b1b2d481a branch: 2.7 parent: 72136:4ff92eb1a915 user: Sandro Tosi <sandro.tosi(a)gmail.com> date: Tue Aug 30 19:40:28 2011 +0200 summary: added versionadd information for pkgutil.get_data(); thanks to Kyle Monson from docs@ files: Doc/library/pkgutil.rst | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Doc/library/pkgutil.rst b/Doc/library/pkgutil.rst --- a/Doc/library/pkgutil.rst +++ b/Doc/library/pkgutil.rst @@ -190,3 +190,5 @@ If the package cannot be located or loaded, or it uses a :pep:`302` loader which does not support :func:`get_data`, then ``None`` is returned. + + .. versionadded:: 2.6 -- Repository URL: http://hg.python.org/cpython

1 0

peps: Add ChildProcessError and ProcessLookupError
by antoine.pitrou 30 Aug '11

30 Aug '11

http://hg.python.org/peps/rev/eebe72bb131f changeset: 3942:eebe72bb131f user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Aug 30 18:35:14 2011 +0200 summary: Add ChildProcessError and ProcessLookupError files: pep-3151.txt | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pep-3151.txt b/pep-3151.txt --- a/pep-3151.txt +++ b/pep-3151.txt @@ -396,6 +396,12 @@ as a generic timeout exception, replacing ``socket.timeout`` and also useful for other types of timeout (for example in Lock.acquire()) +* ``ChildProcessError``: operation on a child process failed (ECHILD); + this is raised mainly by the wait() family of functions. + +* ``ProcessLookupError``: the given process (as identified by, e.g., its + process id) doesn't exist (ESRCH). + In addition, the following exception class is proposed for inclusion: * ``ConnectionError``: a base class for ``ConnectionAbortedError``, @@ -407,6 +413,7 @@ shown:: +-- BlockingIOError EAGAIN, EALREADY, EWOULDBLOCK, EINPROGRESS + +-- ChildProcessError ECHILD +-- ConnectionError +-- BrokenPipeError EPIPE, ESHUTDOWN +-- ConnectionAbortedError ECONNABORTED @@ -418,6 +425,7 @@ +-- IsADirectoryError EISDIR +-- NotADirectoryError ENOTDIR +-- PermissionError EACCES, EPERM + +-- ProcessLookupError ESRCH +-- TimeoutError ETIMEDOUT Naming -- Repository URL: http://hg.python.org/peps

1 0

peps: FileSystemError is gone
by antoine.pitrou 30 Aug '11

30 Aug '11

http://hg.python.org/peps/rev/41e6dd694846 changeset: 3941:41e6dd694846 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Aug 30 18:13:41 2011 +0200 summary: FileSystemError is gone files: pep-3151.txt | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pep-3151.txt b/pep-3151.txt --- a/pep-3151.txt +++ b/pep-3151.txt @@ -396,14 +396,11 @@ as a generic timeout exception, replacing ``socket.timeout`` and also useful for other types of timeout (for example in Lock.acquire()) -In addition, the following exception class are proposed for inclusion: +In addition, the following exception class is proposed for inclusion: * ``ConnectionError``: a base class for ``ConnectionAbortedError``, ``ConnectionRefusedError`` and ``ConnectionResetError`` -* ``FileSystemError``: a base class for ``FileExistsError``, - ``FileNotFoundError``, ``IsADirectoryError`` and ``NotADirectoryError`` - The following drawing tries to sum up the proposed additions, along with the corresponding errno values (where applicable). The root of the sub-hierarchy (OSError, assuming `Step 1`_ is accepted in full) is not @@ -415,12 +412,11 @@ +-- ConnectionAbortedError ECONNABORTED +-- ConnectionRefusedError ECONNREFUSED +-- ConnectionResetError ECONNRESET - +-- FileSystemError - +-- FileExistsError EEXIST - +-- FileNotFoundError ENOENT - +-- IsADirectoryError EISDIR - +-- NotADirectoryError ENOTDIR + +-- FileExistsError EEXIST + +-- FileNotFoundError ENOENT +-- InterruptedError EINTR + +-- IsADirectoryError EISDIR + +-- NotADirectoryError ENOTDIR +-- PermissionError EACCES, EPERM +-- TimeoutError ETIMEDOUT @@ -432,9 +428,6 @@ with the rest of the exception hiearchy, against is concision (especially with long names such as ``ConnectionAbortedError``). -Another cosmetic issue is whether ``FileSystemError`` should be spelled -``FilesystemError`` instead. - Exception attributes -------------------- -- Repository URL: http://hg.python.org/peps

1 0

cpython: Remove misleading comment and code.
by antoine.pitrou 30 Aug '11

30 Aug '11

http://hg.python.org/cpython/rev/b5a5bd429580 changeset: 72137:b5a5bd429580 parent: 72134:b21b0e1478bf user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Aug 30 18:34:47 2011 +0200 summary: Remove misleading comment and code. Windows does set the errno attribute to ENOENT, but the error message displays the Windows error number (3 -> ERROR_PATH_NOT_FOUND), not the errno number (2 -> ENOENT). The Unix errno corresponding to 3 is ESRCH, explaining the confusion, which can be seen in the following snippet: >>> shutil.rmtree("foo") Traceback (most recent call last): File "<stdin>", line 1, in <module> File "Z:\default\lib\shutil.py", line 272, in rmtree onerror(os.listdir, path, sys.exc_info()) File "Z:\default\lib\shutil.py", line 270, in rmtree names = os.listdir(path) WindowsError: [Error 3] The system cannot find the path specified: 'foo\\*.*' >>> e = sys.last_value >>> e.errno 2 >>> e.winerror 3 >>> errno.errorcode[2] 'ENOENT' For reference, see PC/errmap.h and http://msdn.microsoft.com/en-us/library/ms681382%28v=vs.85%29.aspx files: Lib/test/support.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -212,8 +212,7 @@ try: shutil.rmtree(path) except OSError as error: - # Unix returns ENOENT, Windows returns ESRCH. - if error.errno not in (errno.ENOENT, errno.ESRCH): + if error.errno != errno.ENOENT: raise def make_legacy_pyc(source): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Add suspicious entries for the Python Porting HOWTO recently added
by eric.araujo 30 Aug '11

30 Aug '11

http://hg.python.org/cpython/rev/0d7052d89557 changeset: 72135:0d7052d89557 branch: 2.7 parent: 72118:bb7b14dd5ded user: Éric Araujo <merwok(a)netwok.org> date: Tue Aug 30 01:39:25 2011 +0200 summary: Add suspicious entries for the Python Porting HOWTO recently added files: Doc/tools/sphinxext/susp-ignored.csv | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv --- a/Doc/tools/sphinxext/susp-ignored.csv +++ b/Doc/tools/sphinxext/susp-ignored.csv @@ -221,6 +221,9 @@ whatsnew/2.7,862,:Cookie,"export PYTHONWARNINGS=all,error:::Cookie:0" whatsnew/2.7,,::,>>> urlparse.urlparse('http://[1080::8:800:200C:417A]/foo') whatsnew/2.7,,::,"ParseResult(scheme='http', netloc='[1080::8:800:200C:417A]'," +howto/pyporting,75,::,# make sure to use :: Python *and* :: Python :: 3 so +howto/pyporting,75,::,"'Programming Language :: Python'," +howto/pyporting,75,::,'Programming Language :: Python :: 3' documenting/markup,33,.. sectionauthor:,.. sectionauthor:: Guido van Rossum <guido(a)python.org> documenting/markup,42,:mod,:mod:`parrot` -- Dead parrot access documenting/markup,42,`,:mod:`parrot` -- Dead parrot access -- Repository URL: http://hg.python.org/cpython

1 0