Mailman 3 January 2012 - Python-checkins

cpython (3.2): Issue #13889: Add missing _Py_SET_53BIT_PRECISION_* calls around uses of dtoa.c
by mark.dickinson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/cpython/rev/5b8800004955 changeset: 74662:5b8800004955 branch: 3.2 parent: 74659:76d60fcef3db user: Mark Dickinson <mdickinson(a)enthought.com> date: Fri Jan 27 21:16:01 2012 +0000 summary: Issue #13889: Add missing _Py_SET_53BIT_PRECISION_* calls around uses of dtoa.c functions in float round. files: Objects/floatobject.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Objects/floatobject.c b/Objects/floatobject.c --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -919,9 +919,12 @@ char *buf, *buf_end, shortbuf[100], *mybuf=shortbuf; int decpt, sign; PyObject *result = NULL; + _Py_SET_53BIT_PRECISION_HEADER; /* round to a decimal string */ + _Py_SET_53BIT_PRECISION_START; buf = _Py_dg_dtoa(x, 3, ndigits, &decpt, &sign, &buf_end); + _Py_SET_53BIT_PRECISION_END; if (buf == NULL) { PyErr_NoMemory(); return NULL; @@ -944,7 +947,9 @@ /* and convert the resulting string back to a double */ errno = 0; + _Py_SET_53BIT_PRECISION_START; rounded = _Py_dg_strtod(mybuf, NULL); + _Py_SET_53BIT_PRECISION_END; if (errno == ERANGE && fabs(rounded) >= 1.) PyErr_SetString(PyExc_OverflowError, "rounded value too large to represent"); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix intermittent test_ssl failure.
by antoine.pitrou Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/cpython/rev/f2360aafc450 changeset: 74661:f2360aafc450 branch: 2.7 parent: 74658:b2db66bc8e7f user: Antoine Pitrou <solipsis(a)pitrou.net> date: Fri Jan 27 17:33:01 2012 +0100 summary: Fix intermittent test_ssl failure. files: Lib/test/test_ssl.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -562,6 +562,7 @@ + str(connaddr) + '\n') handler = self.ConnectionHandler(self, newconn) handler.start() + handler.join() except socket.timeout: pass except KeyboardInterrupt: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Fix intermittent test_ssl failure.
by antoine.pitrou Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/cpython/rev/b99c54acb22d changeset: 74660:b99c54acb22d parent: 74657:26612ad451ad parent: 74659:76d60fcef3db user: Antoine Pitrou <solipsis(a)pitrou.net> date: Fri Jan 27 17:34:56 2012 +0100 summary: Fix intermittent test_ssl failure. files: Lib/test/test_ssl.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1032,6 +1032,7 @@ + repr(connaddr) + '\n') handler = self.ConnectionHandler(self, newconn, connaddr) handler.start() + handler.join() except socket.timeout: pass except KeyboardInterrupt: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix intermittent test_ssl failure.
by antoine.pitrou Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/cpython/rev/76d60fcef3db changeset: 74659:76d60fcef3db branch: 3.2 parent: 74656:089a086252fc user: Antoine Pitrou <solipsis(a)pitrou.net> date: Fri Jan 27 17:33:01 2012 +0100 summary: Fix intermittent test_ssl failure. files: Lib/test/test_ssl.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -911,6 +911,7 @@ + repr(connaddr) + '\n') handler = self.ConnectionHandler(self, newconn, connaddr) handler.start() + handler.join() except socket.timeout: pass except KeyboardInterrupt: -- Repository URL: http://hg.python.org/cpython

1 0

peps: fix more indentation
by benjamin.peterson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/peps/rev/99f4916dcb4c changeset: 4024:99f4916dcb4c user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jan 27 10:48:17 2012 -0500 summary: fix more indentation files: pep-0409.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0409.txt b/pep-0409.txt --- a/pep-0409.txt +++ b/pep-0409.txt @@ -45,8 +45,8 @@ - raise as NewException() - Reuses the 'as' keyword; can be confusing since we are not really -reraising the originating exception + Reuses the 'as' keyword; can be confusing since we are not really reraising + the originating exception - raise NewException() from None -- Repository URL: http://hg.python.org/peps

1 0

peps: use references
by benjamin.peterson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/peps/rev/b59ce07dab7b changeset: 4023:b59ce07dab7b user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jan 27 10:47:48 2012 -0500 summary: use references files: pep-0409.txt | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/pep-0409.txt b/pep-0409.txt --- a/pep-0409.txt +++ b/pep-0409.txt @@ -76,8 +76,13 @@ raise KeyError() from NameError() but because the 'cause' is None the previous context is discarded. There is a -patch to this effect attached to Issue6210 (http://bugs.python.org/issue6210). +patch to this effect attached to issue 6210 [#issue6210]_. +References +========== + +.. [#issue6210] + http://bugs.python.org/issue6210 Copyright ========= -- Repository URL: http://hg.python.org/peps

1 0

peps: fix indentation
by benjamin.peterson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/peps/rev/80a76bee5094 changeset: 4022:80a76bee5094 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jan 27 10:46:02 2012 -0500 summary: fix indentation files: pep-0409.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/pep-0409.txt b/pep-0409.txt --- a/pep-0409.txt +++ b/pep-0409.txt @@ -50,8 +50,7 @@ - raise NewException() from None - Follows existing syntax of explicitly declaring the originating -exception + Follows existing syntax of explicitly declaring the originating exception - exc = NewException(); exc.__context__ = None; raise exc -- Repository URL: http://hg.python.org/peps

1 0

peps: add post history
by benjamin.peterson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/peps/rev/17afce59bbd8 changeset: 4021:17afce59bbd8 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jan 27 10:45:00 2012 -0500 summary: add post history files: pep-0407.txt | 2 +- pep-0409.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0407.txt b/pep-0407.txt --- a/pep-0407.txt +++ b/pep-0407.txt @@ -9,7 +9,7 @@ Type: Process Content-Type: text/x-rst Created: 2012-01-12 -Post-History: +Post-History: http://mail.python.org/pipermail/python-dev/2012-January/115838.html Resolution: TBD diff --git a/pep-0409.txt b/pep-0409.txt --- a/pep-0409.txt +++ b/pep-0409.txt @@ -8,7 +8,7 @@ Content-Type: text/x-rst Created: 26-Jan-2012 Python-Version: 3.3 -Post-History: +Post-History: 2012-01-27 Abstract -- Repository URL: http://hg.python.org/peps

1 0

peps: pep 409: syntax for supressing exception context
by benjamin.peterson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/peps/rev/f45f0e0c4319 changeset: 4020:f45f0e0c4319 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jan 27 10:42:24 2012 -0500 summary: pep 409: syntax for supressing exception context files: pep-0409.txt | 96 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/pep-0409.txt b/pep-0409.txt new file mode 100644 --- /dev/null +++ b/pep-0409.txt @@ -0,0 +1,96 @@ +PEP: 409 +Title: Suppressing exception context +Version: $Revision$ +Last-Modified: $Date$ +Author: Ethan Furman <ethan(a)stoneleaf.us> +Status: Draft +Type: Standards Track +Content-Type: text/x-rst +Created: 26-Jan-2012 +Python-Version: 3.3 +Post-History: + + +Abstract +======== + +One of the open issues from PEP 3134 is suppressing context: currently there is +no way to do it. This PEP proposes one. + +Motivation +========== + +There are two basic ways to generate exceptions: 1) Python does it (buggy code, +missing resources, ending loops, etc.); and, 2) manually (with a raise +statement). + +When writing libraries, or even just custom classes, it can become necessary to +raise exceptions; moreover it can be useful, even necessary, to change from one +exception to another. To take an example from my dbf module: + + try: + value = int(value) + except Exception: + raise DbfError(...) + +Whatever the original exception was (ValueError, TypeError, or something else) +is irrelevant. The exception from this point on is a DbfError, and the original +exception is of no value. However, if this exception is printed, we would +currently see both. + + +Alternatives +============ +Several possibilities have been put forth: + + - raise as NewException() + + Reuses the 'as' keyword; can be confusing since we are not really +reraising the originating exception + + - raise NewException() from None + + Follows existing syntax of explicitly declaring the originating +exception + + - exc = NewException(); exc.__context__ = None; raise exc + + Very verbose way of the previous method + + - raise NewException.no_context(...) + + Make context suppression a class method. + +All of the above options will require changes to the core. + + +Proposal +======== + +I proprose going with the second option: + + raise NewException from None + +It has the advantage of using the existing pattern of explicitly setting +the cause: + + raise KeyError() from NameError() + +but because the 'cause' is None the previous context is discarded. There is a +patch to this effect attached to Issue6210 (http://bugs.python.org/issue6210). + + +Copyright +========= + +This document has been placed in the public domain. + + +.. + Local Variables: + mode: indented-text + indent-tabs-mode: nil + sentence-end-double-space: t + fill-column: 70 + coding: utf-8 + End: -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 3.2 -> default): merge heads (#13887)
by benjamin.peterson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/cpython/rev/26612ad451ad changeset: 74657:26612ad451ad parent: 74655:d35a25a25cb3 parent: 74656:089a086252fc user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jan 27 09:14:29 2012 -0500 summary: merge heads (#13887) files: Doc/library/collections.rst | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -595,6 +595,11 @@ :class:`dict` class when the requested key is not found; whatever it returns or raises is then returned or raised by :meth:`__getitem__`. + Note that :meth:`__missing__` is *not* called for any operations besides + :meth:`__getitem__`. This means that :meth:`get` will, like normal + dictionaries, return ``None`` as a default rather than using + :attr:`default_factory`. + :class:`defaultdict` objects support the following instance variable: -- Repository URL: http://hg.python.org/cpython

1 0