summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-03 14:13:34 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-03 14:13:34 (GMT)
commite8544336864736ae1ecd67fb8ec07de42f3f7149 (patch)
tree43cca2b8055f481fe4695fd0fb64efd3fe66760f
parent14755b1f6f8118d3de82a77f090687b7f2af94cd (diff)
parenteb0abce2f8d65c097124d05a4f79b6acd6391fa1 (diff)
downloadcpython-e8544336864736ae1ecd67fb8ec07de42f3f7149.zip
cpython-e8544336864736ae1ecd67fb8ec07de42f3f7149.tar.gz
cpython-e8544336864736ae1ecd67fb8ec07de42f3f7149.tar.bz2
Merge issue #16583: Prevent nesting SystemExit in tkinter.CallWrapper
-rw-r--r--Lib/tkinter/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 8063dd6..763a25d 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -1440,8 +1440,8 @@ class CallWrapper:
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()