diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-03-03 19:15:45 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-03-03 19:15:45 (GMT) |
| commit | 180510d29b369b88b0eb8815086162d2d6ef60a7 (patch) | |
| tree | 601f7bbe919055da1871f14c9576f0199507bd72 /Python | |
| parent | e7a30f7216f6cb6733ed6aa450467b487b07cf9b (diff) | |
| download | cpython-180510d29b369b88b0eb8815086162d2d6ef60a7.zip cpython-180510d29b369b88b0eb8815086162d2d6ef60a7.tar.gz cpython-180510d29b369b88b0eb8815086162d2d6ef60a7.tar.bz2 | |
Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
Refactor test_logging to use unittest. This should finally solve the flakiness
issues.
Thanks to Antoine Pitrou for the patch.
........
r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
Move test_largefile over to using 'with' statements for open files.
Also rename the driver function to test_main() instead of main_test().
........
r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
Add a note in the main test class' docstring that the order of execution of the
tests is important.
........
r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
Add a note in the main test class' docstring that the order of execution of the
tests is important.
........
r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
Add test_main() functions to various tests where it was simple to do. Done so
that regrtest can execute the test_main() directly instead of relying on import
side-effects.
........
r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
Only DECREF if ret != NULL
........
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index f8a6a6e..ec6d4e3 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1455,6 +1455,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } continue; + PREDICTED(END_FINALLY); case END_FINALLY: v = POP(); if (PyLong_Check(v)) { @@ -2069,6 +2070,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) x = POP(); Py_DECREF(x); } + PREDICT(END_FINALLY); break; } |