[Python-checkins] cpython (merge 3.2 -> 3.3): Merge issue #16583: Prevent nesting SystemExit in tkinter.CallWrapper

Mon Dec 3 15:14:00 CET 2012

http://hg.python.org/cpython/rev/96b6e6522a1d
changeset: 80708:96b6e6522a1d
branch: 3.3
parent: 80705:2a67d79490ae
parent: 80707:b742bbf6b07f
user: Andrew Svetlov <andrew.svetlov at gmail.com>
date: Mon Dec 03 16:13:34 2012 +0200
summary:
 Merge issue #16583: Prevent nesting SystemExit in tkinter.CallWrapper
files:
 Lib/tkinter/__init__.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -1440,8 +1440,8 @@
 if self.subst:
 args = self.subst(*args)
 return self.func(*args)
- except SystemExit as msg:
- raise SystemExit(msg)
+ except SystemExit:
+ raise
 except:
 self.widget._report_exception()
 
-- 
Repository URL: http://hg.python.org/cpython
