Mailman 3 April 2015 - Python-checkins

cpython: Issue #23618: Don't declare recvmsg/sendmsg helper functions on Windows
by victor.stinner April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/aad52bfc816f changeset: 95375:aad52bfc816f user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Apr 02 12:28:07 2015 +0200 summary: Issue #23618: Don't declare recvmsg/sendmsg helper functions on Windows files: Modules/socketmodule.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -… [View More]

1 0

cpython: Issue #23618: Document EINTR changes in socket documentation
by victor.stinner April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/f22188acc77d changeset: 95376:f22188acc77d user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Apr 02 11:49:42 2015 +0200 summary: Issue #23618: Document EINTR changes in socket documentation files: Doc/library/functions.rst | 2 +- Doc/library/os.rst | 8 ++-- Doc/library/socket.rst | 40 +++++++++++++++++++++++++++ Doc/whatsnew/3.5.rst | 11 +++++++ 4 files changed, 56 insertions(+), 5 deletions(-) … [View More]diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1066,7 +1066,7 @@ The ``'U'`` mode. .. versionchanged:: 3.5 - If the system call is interrupted and the signal does not raise an + If the system call is interrupted and the signal handler does not raise an exception, the function now retries the system call instead of raising an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -906,7 +906,7 @@ The *dir_fd* argument. .. versionchanged:: 3.5 - If the system call is interrupted and the signal does not raise an + If the system call is interrupted and the signal handler does not raise an exception, the function now retries the system call instead of raising an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). @@ -1088,7 +1088,7 @@ :meth:`~file.read` or :meth:`~file.readline` methods. .. versionchanged:: 3.5 - If the system call is interrupted and the signal does not raise an + If the system call is interrupted and the signal handler does not raise an exception, the function now retries the system call instead of raising an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). @@ -1208,7 +1208,7 @@ :meth:`~file.write` method. .. versionchanged:: 3.5 - If the system call is interrupted and the signal does not raise an + If the system call is interrupted and the signal handler does not raise an exception, the function now retries the system call instead of raising an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). @@ -3375,7 +3375,7 @@ functions called with :const:`P_NOWAIT` return suitable process handles. .. versionchanged:: 3.5 - If the system call is interrupted and the signal does not raise an + If the system call is interrupted and the signal handler does not raise an exception, the function now retries the system call instead of raising an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -793,6 +793,11 @@ .. versionchanged:: 3.4 The socket is now non-inheritable. + .. versionchanged:: 3.5 + If the system call is interrupted and the signal handler does not raise + an exception, the method now retries the system call instead of raising + an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. method:: socket.bind(address) @@ -966,6 +971,11 @@ For best match with hardware and network realities, the value of *bufsize* should be a relatively small power of 2, for example, 4096. + .. versionchanged:: 3.5 + If the system call is interrupted and the signal handler does not raise + an exception, the method now retries the system call instead of raising + an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. method:: socket.recvfrom(bufsize[, flags]) @@ -975,6 +985,11 @@ :manpage:`recv(2)` for the meaning of the optional argument *flags*; it defaults to zero. (The format of *address* depends on the address family --- see above.) + .. versionchanged:: 3.5 + If the system call is interrupted and the signal handler does not raise + an exception, the method now retries the system call instead of raising + an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. method:: socket.recvmsg(bufsize[, ancbufsize[, flags]]) @@ -1041,6 +1056,11 @@ .. versionadded:: 3.3 + .. versionchanged:: 3.5 + If the system call is interrupted and the signal handler does not raise + an exception, the method now retries the system call instead of raising + an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. method:: socket.recvmsg_into(buffers[, ancbufsize[, flags]]) @@ -1107,6 +1127,11 @@ application needs to attempt delivery of the remaining data. For further information on this topic, consult the :ref:`socket-howto`. + .. versionchanged:: 3.5 + If the system call is interrupted and the signal handler does not raise + an exception, the method now retries the system call instead of raising + an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. method:: socket.sendall(bytes[, flags]) @@ -1117,6 +1142,11 @@ success. On error, an exception is raised, and there is no way to determine how much data, if any, was successfully sent. + .. versionchanged:: 3.5 + If the system call is interrupted and the signal handler does not raise + an exception, the method now retries the system call instead of raising + an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. method:: socket.sendto(bytes, address) socket.sendto(bytes, flags, address) @@ -1127,6 +1157,11 @@ bytes sent. (The format of *address* depends on the address family --- see above.) + .. versionchanged:: 3.5 + If the system call is interrupted and the signal handler does not raise + an exception, the method now retries the system call instead of raising + an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. method:: socket.sendmsg(buffers[, ancdata[, flags[, address]]]) @@ -1163,6 +1198,11 @@ .. versionadded:: 3.3 + .. versionchanged:: 3.5 + If the system call is interrupted and the signal handler does not raise + an exception, the method now retries the system call instead of raising + an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. method:: socket.sendfile(file, offset=0, count=None) Send a file until EOF is reached by using high-performance diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -640,6 +640,17 @@ - :func:`os.read`, :func:`os.write` - :func:`select.select`, :func:`select.poll.poll`, :func:`select.epoll.poll`, :func:`select.kqueue.control`, :func:`select.devpoll.poll` + - :func:`socket.socket` methods: + + * :meth:`~socket.socket.accept` + * :meth:`~socket.socket.recv` + * :meth:`~socket.socket.recvfrom` + * :meth:`~socket.socket.recvmsg` + * :meth:`~socket.socket.send` + * :meth:`~socket.socket.sendall` + * :meth:`~socket.socket.sendmsg` + * :meth:`~socket.socket.sendto` + - :func:`signal.sigtimedwait`, :func:`signal.sigwaitinfo` - :func:`time.sleep` -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (3.4): Issue #21526: Fixed the test_booleans test for wantobjects = 0.
by serhiy.storchaka April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/4255ca2f5314 changeset: 95373:4255ca2f5314 branch: 3.4 parent: 95369:de3496cd609e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Apr 02 11:46:07 2015 +0300 summary: Issue #21526: Fixed the test_booleans test for wantobjects = 0. files: Lib/test/test_tcl.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py --- a/Lib/test/test_tcl.py +++ b/Lib/… [View More]

1 0

cpython (merge 3.4 -> default): Issue #21526: Fixed the test_booleans test for wantobjects = 0.
by serhiy.storchaka April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/bb0b5b6c13f3 changeset: 95374:bb0b5b6c13f3 parent: 95370:b2413da7516f parent: 95373:4255ca2f5314 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Apr 02 11:47:51 2015 +0300 summary: Issue #21526: Fixed the test_booleans test for wantobjects = 0. files: Lib/test/test_tcl.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py --- a/Lib/test/… [View More]

1 0

cpython (2.7): Issue #21526: Fixed the test_booleans test for wantobjects = 0.
by serhiy.storchaka April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/954e7e1d85f1 changeset: 95372:954e7e1d85f1 branch: 2.7 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Apr 02 11:46:07 2015 +0300 summary: Issue #21526: Fixed the test_booleans test for wantobjects = 0. files: Lib/test/test_tcl.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -395,8 +395,… [View More]

1 0

Daily reference leaks (c27585e43e50): sum=390
by solipsis＠pitrou.net April 2, 2015

April 2, 2015

results for c27585e43e50 on branch "default" -------------------------------------------- test_collections leaked [-2, -2, 0] references, sum=-4 test_deque leaked [91, 91, 91] references, sum=273 test_deque leaked [21, 21, 21] memory blocks, sum=63 test_functools leaked [0, 0, 3] memory blocks, sum=3 test_multiprocessing_forkserver leaked [0, 0, 38] references, sum=38 test_multiprocessing_forkserver leaked [0, 0, 17] memory blocks, sum=17 Command line was: ['./python', '-m', 'test.regrtest', … [View More]

1 0

cpython (merge 3.4 -> default): Issue #21526: Fixed support of new boolean type in Tcl 8.5.
by serhiy.storchaka April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/b2413da7516f changeset: 95370:b2413da7516f parent: 95368:cf0cac11813d parent: 95369:de3496cd609e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Apr 02 10:58:40 2015 +0300 summary: Issue #21526: Fixed support of new boolean type in Tcl 8.5. files: Lib/test/test_tcl.py | 15 +++++++++++++++ Misc/NEWS | 4 ++-- Modules/_tkinter.c | 23 +++++++++++++++++++---- 3 files changed, 36 insertions(+), 6 … [View More]deletions(-) diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -378,6 +378,21 @@ if tcl_version >= (8, 5): check('2**64', True) + def test_booleans(self): + tcl = self.interp + def check(expr, expected): + result = tcl.call('expr', expr) + self.assertEqual(result, expected) + self.assertIsInstance(result, int) + check('true', True) + check('yes', True) + check('on', True) + check('false', False) + check('no', False) + check('off', False) + check('1 < 2', True) + check('1 > 2', False) + def test_passing_values(self): def passValue(value): return self.interp.call('set', '_', value) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,8 @@ Library ------- +- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5. + - Issue #23836: Fix the faulthandler module to handle reentrant calls to its signal handlers. @@ -146,8 +148,6 @@ - Issue #23252: Added support for writing ZIP files to unseekable streams. -- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5. - - Issue #23647: Increase impalib's MAXLINE to accommodate modern mailbox sizes. - Issue #23539: If body is None, http.client.HTTPConnection.request now sets diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -998,6 +998,15 @@ } } +static PyObject * +fromBoolean(PyObject* tkapp, Tcl_Obj *value) +{ + int boolValue; + if (Tcl_GetBooleanFromObj(Tkapp_Interp(tkapp), value, &boolValue) == TCL_ERROR) + return Tkinter_Error(tkapp); + return PyBool_FromLong(boolValue); +} + static PyObject* FromObj(PyObject* tkapp, Tcl_Obj *value) { @@ -1011,10 +1020,7 @@ if (value->typePtr == app->BooleanType || value->typePtr == app->OldBooleanType) { - int boolValue; - if (Tcl_GetBooleanFromObj(interp, value, &boolValue) == TCL_ERROR) - return Tkinter_Error(tkapp); - return PyBool_FromLong(boolValue); + return fromBoolean(tkapp, value); } if (value->typePtr == app->ByteArrayType) { @@ -1069,6 +1075,15 @@ Tcl_GetCharLength(value)); } +#if TK_VERSION_HEX >= 0x08050000 + if (app->BooleanType == NULL && + strcmp(value->typePtr->name, "booleanString") == 0) { + /* booleanString type is not registered in Tcl */ + app->BooleanType = value->typePtr; + return fromBoolean(tkapp, value); + } +#endif + return newPyTclObject(value); } -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (3.4): Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.
by serhiy.storchaka April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/de3496cd609e changeset: 95369:de3496cd609e branch: 3.4 parent: 95367:7907746baa0d user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Apr 02 10:35:57 2015 +0300 summary: Issue #21526: Tkinter now supports new boolean type in Tcl 8.5. files: Lib/test/test_tcl.py | 15 +++++++++ Misc/NEWS | 2 + Modules/_tkinter.c | 49 ++++++++++++++++++++++--------- 3 files changed, 51 insertions(+), 15 deletions(-) … [View More] diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -378,6 +378,21 @@ if tcl_version >= (8, 5): check('2**64', True) + def test_booleans(self): + tcl = self.interp + def check(expr, expected): + result = tcl.call('expr', expr) + self.assertEqual(result, expected) + self.assertIsInstance(result, int) + check('true', True) + check('yes', True) + check('on', True) + check('false', False) + check('no', False) + check('off', False) + check('1 < 2', True) + check('1 > 2', False) + def test_passing_values(self): def passValue(value): return self.interp.call('set', '_', value) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,8 @@ Library ------- +- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5. + - Issue #23838: linecache now clears the cache and returns an empty result on MemoryError. diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -242,13 +242,14 @@ int dispatching; /* We cannot include tclInt.h, as this is internal. So we cache interesting types here. */ - Tcl_ObjType *BooleanType; - Tcl_ObjType *ByteArrayType; - Tcl_ObjType *DoubleType; - Tcl_ObjType *IntType; - Tcl_ObjType *ListType; - Tcl_ObjType *ProcBodyType; - Tcl_ObjType *StringType; + const Tcl_ObjType *OldBooleanType; + const Tcl_ObjType *BooleanType; + const Tcl_ObjType *ByteArrayType; + const Tcl_ObjType *DoubleType; + const Tcl_ObjType *IntType; + const Tcl_ObjType *ListType; + const Tcl_ObjType *ProcBodyType; + const Tcl_ObjType *StringType; } TkappObject; #define Tkapp_Interp(v) (((TkappObject *) (v))->interp) @@ -577,7 +578,8 @@ } #endif - v->BooleanType = Tcl_GetObjType("boolean"); + v->OldBooleanType = Tcl_GetObjType("boolean"); + v->BooleanType = Tcl_GetObjType("booleanString"); v->ByteArrayType = Tcl_GetObjType("bytearray"); v->DoubleType = Tcl_GetObjType("double"); v->IntType = Tcl_GetObjType("int"); @@ -979,20 +981,29 @@ } } +static PyObject * +fromBoolean(PyObject* tkapp, Tcl_Obj *value) +{ + int boolValue; + if (Tcl_GetBooleanFromObj(Tkapp_Interp(tkapp), value, &boolValue) == TCL_ERROR) + return Tkinter_Error(tkapp); + return PyBool_FromLong(boolValue); +} + static PyObject* FromObj(PyObject* tkapp, Tcl_Obj *value) { PyObject *result = NULL; TkappObject *app = (TkappObject*)tkapp; + Tcl_Interp *interp = Tkapp_Interp(tkapp); if (value->typePtr == NULL) { return unicodeFromTclStringAndSize(value->bytes, value->length); } - if (value->typePtr == app->BooleanType) { - result = value->internalRep.longValue ? Py_True : Py_False; - Py_INCREF(result); - return result; + if (value->typePtr == app->BooleanType || + value->typePtr == app->OldBooleanType) { + return fromBoolean(tkapp, value); } if (value->typePtr == app->ByteArrayType) { @@ -1015,15 +1026,14 @@ PyObject *elem; Tcl_Obj *tcl_elem; - status = Tcl_ListObjLength(Tkapp_Interp(tkapp), value, &size); + status = Tcl_ListObjLength(interp, value, &size); if (status == TCL_ERROR) return Tkinter_Error(tkapp); result = PyTuple_New(size); if (!result) return NULL; for (i = 0; i < size; i++) { - status = Tcl_ListObjIndex(Tkapp_Interp(tkapp), - value, i, &tcl_elem); + status = Tcl_ListObjIndex(interp, value, i, &tcl_elem); if (status == TCL_ERROR) { Py_DECREF(result); return Tkinter_Error(tkapp); @@ -1048,6 +1058,15 @@ Tcl_GetCharLength(value)); } +#if TK_VERSION_HEX >= 0x08050000 + if (app->BooleanType == NULL && + strcmp(value->typePtr->name, "booleanString") == 0) { + /* booleanString type is not registered in Tcl */ + app->BooleanType = value->typePtr; + return fromBoolean(tkapp, value); + } +#endif + return newPyTclObject(value); } -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (2.7): Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.
by serhiy.storchaka April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/d0554559de53 changeset: 95371:d0554559de53 branch: 2.7 parent: 95365:4f2391e86643 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Apr 02 10:35:57 2015 +0300 summary: Issue #21526: Tkinter now supports new boolean type in Tcl 8.5. files: Lib/test/test_tcl.py | 15 +++++++++ Misc/NEWS | 2 + Modules/_tkinter.c | 49 ++++++++++++++++++++++--------- 3 files changed, 51 insertions(+), 15 deletions(-) … [View More] diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -391,6 +391,21 @@ if tcl_version >= (8, 5): check('2**64', True) + def test_booleans(self): + tcl = self.interp + def check(expr, expected): + result = tcl.call('expr', expr) + self.assertEqual(result, expected) + self.assertIsInstance(result, int) + check('true', True) + check('yes', True) + check('on', True) + check('false', False) + check('no', False) + check('off', False) + check('1 < 2', True) + check('1 > 2', False) + def test_passing_values(self): def passValue(value): return self.interp.call('set', '_', value) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -21,6 +21,8 @@ Library ------- +- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5. + - Issue #23838: linecache now clears the cache and returns an empty result on MemoryError. diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -257,13 +257,14 @@ int dispatching; /* We cannot include tclInt.h, as this is internal. So we cache interesting types here. */ - Tcl_ObjType *BooleanType; - Tcl_ObjType *ByteArrayType; - Tcl_ObjType *DoubleType; - Tcl_ObjType *IntType; - Tcl_ObjType *ListType; - Tcl_ObjType *ProcBodyType; - Tcl_ObjType *StringType; + const Tcl_ObjType *OldBooleanType; + const Tcl_ObjType *BooleanType; + const Tcl_ObjType *ByteArrayType; + const Tcl_ObjType *DoubleType; + const Tcl_ObjType *IntType; + const Tcl_ObjType *ListType; + const Tcl_ObjType *ProcBodyType; + const Tcl_ObjType *StringType; } TkappObject; #define Tkapp_Check(v) (Py_TYPE(v) == &Tkapp_Type) @@ -733,7 +734,8 @@ } #endif - v->BooleanType = Tcl_GetObjType("boolean"); + v->OldBooleanType = Tcl_GetObjType("boolean"); + v->BooleanType = Tcl_GetObjType("booleanString"); v->ByteArrayType = Tcl_GetObjType("bytearray"); v->DoubleType = Tcl_GetObjType("double"); v->IntType = Tcl_GetObjType("int"); @@ -1129,21 +1131,30 @@ } } +static PyObject * +fromBoolean(PyObject* tkapp, Tcl_Obj *value) +{ + int boolValue; + if (Tcl_GetBooleanFromObj(Tkapp_Interp(tkapp), value, &boolValue) == TCL_ERROR) + return Tkinter_Error(tkapp); + return PyBool_FromLong(boolValue); +} + static PyObject* FromObj(PyObject* tkapp, Tcl_Obj *value) { PyObject *result = NULL; TkappObject *app = (TkappObject*)tkapp; + Tcl_Interp *interp = Tkapp_Interp(tkapp); if (value->typePtr == NULL) { result = fromTclStringAndSize(value->bytes, value->length); return result; } - if (value->typePtr == app->BooleanType) { - result = value->internalRep.longValue ? Py_True : Py_False; - Py_INCREF(result); - return result; + if (value->typePtr == app->BooleanType || + value->typePtr == app->OldBooleanType) { + return fromBoolean(tkapp, value); } if (value->typePtr == app->ByteArrayType) { @@ -1166,15 +1177,14 @@ PyObject *elem; Tcl_Obj *tcl_elem; - status = Tcl_ListObjLength(Tkapp_Interp(tkapp), value, &size); + status = Tcl_ListObjLength(interp, value, &size); if (status == TCL_ERROR) return Tkinter_Error(tkapp); result = PyTuple_New(size); if (!result) return NULL; for (i = 0; i < size; i++) { - status = Tcl_ListObjIndex(Tkapp_Interp(tkapp), - value, i, &tcl_elem); + status = Tcl_ListObjIndex(interp, value, i, &tcl_elem); if (status == TCL_ERROR) { Py_DECREF(result); return Tkinter_Error(tkapp); @@ -1222,6 +1232,15 @@ #endif } +#if TK_VERSION_HEX >= 0x08050000 + if (app->BooleanType == NULL && + strcmp(value->typePtr->name, "booleanString") == 0) { + /* booleanString type is not registered in Tcl */ + app->BooleanType = value->typePtr; + return fromBoolean(tkapp, value); + } +#endif + return newPyTclObject(value); } -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (merge 3.4 -> default): Issue #22977: Fixed formatting Windows error messages on Wine.
by serhiy.storchaka April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/cf0cac11813d changeset: 95368:cf0cac11813d parent: 95366:c27585e43e50 parent: 95367:7907746baa0d user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Apr 02 09:50:06 2015 +0300 summary: Issue #22977: Fixed formatting Windows error messages on Wine. Patch by Martin Panter. files: Lib/test/test_exceptions.py | 10 +++++++++- Misc/NEWS | 3 +++ Python/errors.c | 4 ++-- 3 files changed, … [View More]14 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -6,10 +6,11 @@ import pickle import weakref import errno +import ctypes from test.support import (TESTFN, captured_output, check_impl_detail, check_warnings, cpython_only, gc_collect, run_unittest, - no_tracing, unlink) + no_tracing, unlink, get_attribute) class NaiveException(Exception): def __init__(self, x): @@ -245,6 +246,13 @@ self.assertEqual(w.strerror, 'foo') self.assertEqual(w.filename, None) + def test_windows_message(self): + """Should fill in unknown error code in Windows error message""" + windll = get_attribute(ctypes, "windll") + code = int.from_bytes(b"\xE0msc", "big") + with self.assertRaisesRegex(OSError, hex(code)): + windll.kernel32.RaiseException(code, 0, 0, None) + def testAttributes(self): # test that exception attributes are happy diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #22977: Fixed formatting Windows error messages on Wine. + Patch by Martin Panter. + Library ------- diff --git a/Python/errors.c b/Python/errors.c --- a/Python/errors.c +++ b/Python/errors.c @@ -491,7 +491,7 @@ /* Only ever seen this in out-of-mem situations */ s_buf = NULL; - message = PyUnicode_FromFormat("Windows Error 0x%X", i); + message = PyUnicode_FromFormat("Windows Error 0x%x", i); } else { /* remove trailing cr/lf and dots */ while (len > 0 && (s_buf[len-1] <= L' ' || s_buf[len-1] == L'.')) @@ -600,7 +600,7 @@ NULL); /* no args */ if (len==0) { /* Only seen this in out of mem situations */ - message = PyUnicode_FromFormat("Windows Error 0x%X", err); + message = PyUnicode_FromFormat("Windows Error 0x%x", err); s_buf = NULL; } else { /* remove trailing cr/lf and dots */ -- Repository URL: https://hg.python.org/cpython [View Less]

1 0