Mailman 3 January 2015 - Python-checkins

cpython (3.4): Issue #23353: Fix the exception handling of generators in PyEval_EvalFrameEx().
by victor.stinner Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/4555da8c3091 changeset: 94412:4555da8c3091 branch: 3.4 parent: 94410:5b5a581d91c8 user: Victor Stinner <victor.stinner(a)gmail.com> date: Sat Jan 31 10:29:47 2015 +0100 summary: Issue #23353: Fix the exception handling of generators in PyEval_EvalFrameEx(). At entry, save or swap the exception state even if PyEval_EvalFrameEx() is called with throwflag=0. At exit, the exception state is now always restored or swapped, not only … [View More]if why is WHY_YIELD or WHY_RETURN. Patch co-written with Antoine Pitrou. files: Lib/test/test_generators.py | 109 ++++++++++++++++++++++++ Misc/NEWS | 6 + Python/ceval.c | 7 +- 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -50,6 +50,115 @@ self.assertEqual(gc.garbage, old_garbage) +class ExceptionTest(unittest.TestCase): + # Tests for the issue #23353: check that the currently handled exception + # is correctly saved/restored in PyEval_EvalFrameEx(). + + def test_except_throw(self): + def store_raise_exc_generator(): + try: + self.assertEqual(sys.exc_info()[0], None) + yield + except Exception as exc: + # exception raised by gen.throw(exc) + self.assertEqual(sys.exc_info()[0], ValueError) + self.assertIsNone(exc.__context__) + yield + + # ensure that the exception is not lost + self.assertEqual(sys.exc_info()[0], ValueError) + yield + + # we should be able to raise back the ValueError + raise + + make = store_raise_exc_generator() + next(make) + + try: + raise ValueError() + except Exception as exc: + try: + make.throw(exc) + except Exception: + pass + + next(make) + with self.assertRaises(ValueError) as cm: + next(make) + self.assertIsNone(cm.exception.__context__) + + self.assertEqual(sys.exc_info(), (None, None, None)) + + def test_except_next(self): + def gen(): + self.assertEqual(sys.exc_info()[0], ValueError) + yield "done" + + g = gen() + try: + raise ValueError + except Exception: + self.assertEqual(next(g), "done") + self.assertEqual(sys.exc_info(), (None, None, None)) + + def test_except_gen_except(self): + def gen(): + try: + self.assertEqual(sys.exc_info()[0], None) + yield + # we are called from "except ValueError:", TypeError must + # inherit ValueError in its context + raise TypeError() + except TypeError as exc: + self.assertEqual(sys.exc_info()[0], TypeError) + self.assertEqual(type(exc.__context__), ValueError) + # here we are still called from the "except ValueError:" + self.assertEqual(sys.exc_info()[0], ValueError) + yield + self.assertIsNone(sys.exc_info()[0]) + yield "done" + + g = gen() + next(g) + try: + raise ValueError + except Exception: + next(g) + + self.assertEqual(next(g), "done") + self.assertEqual(sys.exc_info(), (None, None, None)) + + def test_except_throw_exception_context(self): + def gen(): + try: + try: + self.assertEqual(sys.exc_info()[0], None) + yield + except ValueError: + # we are called from "except ValueError:" + self.assertEqual(sys.exc_info()[0], ValueError) + raise TypeError() + except Exception as exc: + self.assertEqual(sys.exc_info()[0], TypeError) + self.assertEqual(type(exc.__context__), ValueError) + # we are still called from "except ValueError:" + self.assertEqual(sys.exc_info()[0], ValueError) + yield + self.assertIsNone(sys.exc_info()[0]) + yield "done" + + g = gen() + next(g) + try: + raise ValueError + except Exception as exc: + g.throw(exc) + + self.assertEqual(next(g), "done") + self.assertEqual(sys.exc_info(), (None, None, None)) + + tutorial_tests = """ Let's try a simple generator: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -50,6 +50,12 @@ Library ------- +- Issue #23353: Fix the exception handling of generators in + PyEval_EvalFrameEx(). At entry, save or swap the exception state even if + PyEval_EvalFrameEx() is called with throwflag=0. At exit, the exception state + is now always restored or swapped, not only if why is WHY_YIELD or + WHY_RETURN. Patch co-written with Antoine Pitrou. + - Issue #18518: timeit now rejects statements which can't be compiled outside a function or a loop (e.g. "return" or "break"). diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1189,8 +1189,8 @@ f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */ f->f_executing = 1; - if (co->co_flags & CO_GENERATOR && !throwflag) { - if (f->f_exc_type != NULL && f->f_exc_type != Py_None) { + if (co->co_flags & CO_GENERATOR) { + if (!throwflag && f->f_exc_type != NULL && f->f_exc_type != Py_None) { /* We were in an except handler when we left, restore the exception state which was put aside (see YIELD_VALUE). */ @@ -3172,7 +3172,8 @@ || (retval == NULL && PyErr_Occurred())); fast_yield: - if (co->co_flags & CO_GENERATOR && (why == WHY_YIELD || why == WHY_RETURN)) { + if (co->co_flags & CO_GENERATOR) { + /* The purpose of this block is to put aside the generator's exception state and restore that of the calling frame. If the current exception state is from the caller, we clear the exception values -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (2.7): Completed Misc/NEWS entry.
by serhiy.storchaka Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/db80b19730f0 changeset: 94408:db80b19730f0 branch: 2.7 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Jan 31 11:42:04 2015 +0200 summary: Completed Misc/NEWS entry. files: Misc/NEWS | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -86,7 +86,8 @@ Tests ----- -- Issue #19949: The test_xpickle test now +- Issue #19949: The test_xpickle … [View More]

1 0

cpython (2.7): Issue #22765: Fixed test_gdb failures. Supressed unexpected gdb output.
by serhiy.storchaka Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/47a9cb7ec0cb changeset: 94409:47a9cb7ec0cb branch: 2.7 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Jan 31 11:48:36 2015 +0200 summary: Issue #22765: Fixed test_gdb failures. Supressed unexpected gdb output. Patch by Bohuslav Kabrda. files: Lib/test/test_gdb.py | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py --- a/Lib/test/… [View More]

1 0

cpython (3.4): Issue #22765: Fixed test_gdb failures. Supressed unexpected gdb output.
by serhiy.storchaka Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/5b5a581d91c8 changeset: 94410:5b5a581d91c8 branch: 3.4 parent: 94393:fadfcb2d5a47 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Jan 31 11:48:52 2015 +0200 summary: Issue #22765: Fixed test_gdb failures. Supressed unexpected gdb output. Patch by Bohuslav Kabrda. files: Lib/test/test_gdb.py | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_gdb.py b/Lib/test/… [View More]

1 0

cpython (merge 3.4 -> default): Issue #22765: Fixed test_gdb failures. Supressed unexpected gdb output.
by serhiy.storchaka Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/3813a5282eac changeset: 94411:3813a5282eac parent: 94404:f726b27bda8d parent: 94410:5b5a581d91c8 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Jan 31 11:50:22 2015 +0200 summary: Issue #22765: Fixed test_gdb failures. Supressed unexpected gdb output. Patch by Bohuslav Kabrda. files: Lib/test/test_gdb.py | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_gdb.… [View More]

1 0

cpython (2.7): Avoid deprecation warnings.
by serhiy.storchaka Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/6ddcc1407ffa changeset: 94407:6ddcc1407ffa branch: 2.7 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Jan 31 11:27:06 2015 +0200 summary: Avoid deprecation warnings. files: Lib/ctypes/util.py | 2 +- Lib/encodings/uu_codec.py | 2 +- Lib/test/test_descr.py | 2 +- Lib/test/test_exceptions.py | 2 +- Lib/test/test_ssl.py | 2 +- Lib/test/test_threading.py | 6 +++--- Lib/test/… [View More]test_timeit.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -177,7 +177,7 @@ res = re.findall(expr, data) if not res: return _get_soname(_findLib_gcc(name)) - res.sort(cmp= lambda x,y: cmp(_num_version(x), _num_version(y))) + res.sort(key=_num_version) return res[-1] elif sys.platform == "sunos5": diff --git a/Lib/encodings/uu_codec.py b/Lib/encodings/uu_codec.py --- a/Lib/encodings/uu_codec.py +++ b/Lib/encodings/uu_codec.py @@ -84,7 +84,7 @@ data = a2b_uu(s) except binascii.Error, v: # Workaround for broken uuencoders by /Fredrik Lundh - nbytes = (((ord(s[0])-32) & 63) * 4 + 5) / 3 + nbytes = (((ord(s[0])-32) & 63) * 4 + 5) // 3 data = a2b_uu(s[:nbytes]) #sys.stderr.write("Warning: %s\n" % str(v)) write(data) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -2066,7 +2066,7 @@ "attr on a property" % attr) class D(object): - __getitem__ = property(lambda s: 1/0) + __getitem__ = property(lambda s: 1.0/0.0) d = D() try: 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 @@ -92,7 +92,7 @@ self.raise_catch(TabError, "TabError") # can only be tested under -tt, and is the only test for -tt - #try: compile("try:\n\t1/0\n \t1/0\nfinally:\n pass\n", '<string>', 'exec') + #try: compile("try:\n\t1.0/0.0\n \t1.0/0.0\nfinally:\n pass\n", '<string>', 'exec') #except TabError: pass #else: self.fail("TabError not raised") 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 @@ -2954,7 +2954,7 @@ server_context, other_context, client_context = self.sni_contexts() def cb_raising(ssl_sock, server_name, initial_context): - 1/0 + 1.0/0.0 server_context.set_servername_callback(cb_raising) with self.assertRaises(ssl.SSLError) as cm, \ diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -797,7 +797,7 @@ running = True while running: time.sleep(0.01) - 1/0 + 1.0/0.0 t = threading.Thread(target=run) t.start() while not running: @@ -824,7 +824,7 @@ running = True while running: time.sleep(0.01) - 1/0 + 1.0/0.0 t = threading.Thread(target=run) t.start() while not running: @@ -852,7 +852,7 @@ running = True while running: time.sleep(0.01) - 1/0 + 1.0/0.0 sys.stderr = None t = threading.Thread(target=run) t.start() diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py --- a/Lib/test/test_timeit.py +++ b/Lib/test/test_timeit.py @@ -197,7 +197,7 @@ def test_print_exc(self): s = StringIO() - t = timeit.Timer("1/0") + t = timeit.Timer("1.0/0.0") try: t.timeit() except: -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (2.7): test_spwd skipping is expected on win32.
by serhiy.storchaka Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/f5df01f69a3e changeset: 94406:f5df01f69a3e branch: 2.7 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Jan 31 10:20:31 2015 +0200 summary: test_spwd skipping is expected on win32. files: Lib/test/regrtest.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -1191,6 +1191,7 @@ test_pwd … [View More]

1 0

cpython (2.7): Restored test_xpickle compatibility with Python 2.5.
by serhiy.storchaka Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/19305fa6420b changeset: 94405:19305fa6420b branch: 2.7 parent: 94402:aa6f8e067ec3 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Jan 31 09:25:16 2015 +0200 summary: Restored test_xpickle compatibility with Python 2.5. Python 2.5 has no unittest.skipUnless. files: Lib/test/test_xpickle.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_xpickle.py b/Lib/test/test_xpickle.py … [View More]

1 0

cpython: Minor tweak to improve code clarity.
by raymond.hettinger Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/f726b27bda8d changeset: 94404:f726b27bda8d user: Raymond Hettinger <python(a)rcn.com> date: Fri Jan 30 20:09:23 2015 -0800 summary: Minor tweak to improve code clarity. files: Objects/setobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/setobject.c b/Objects/setobject.c --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -150,7 +150,7 @@ goto found_null; if (i + … [View More]

1 0

cpython: Fix typo in a comment.
by raymond.hettinger Jan. 31, 2015

Jan. 31, 2015

https://hg.python.org/cpython/rev/73c31db9fba4 changeset: 94403:73c31db9fba4 parent: 94397:c0d25de5919e user: Raymond Hettinger <python(a)rcn.com> date: Fri Jan 30 18:02:15 2015 -0800 summary: Fix typo in a comment. files: Objects/setobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/setobject.c b/Objects/setobject.c --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -681,7 +681,7 @@ hash *= (Py_uhash_t)… [View More]

1 0