summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-02-25 22:37:36 (GMT)
committerGuido van Rossum <guido@python.org>2007-02-25 22:37:36 (GMT)
commit5dc0d9708cdb347a5e7ec3ff7211ce2cfa6b26b1 (patch)
treee6a22d57d3da93a278cfafb19b54f707fe6507e2
parent5c0a6de79acfa39cc5e5b522d638c65dc1347030 (diff)
downloadcpython-5dc0d9708cdb347a5e7ec3ff7211ce2cfa6b26b1.zip
cpython-5dc0d9708cdb347a5e7ec3ff7211ce2cfa6b26b1.tar.gz
cpython-5dc0d9708cdb347a5e7ec3ff7211ce2cfa6b26b1.tar.bz2
Fix merge bug (lost line causing syntax error).
-rw-r--r--Lib/idlelib/PyShell.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index b16bbc0..692467d 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -722,6 +722,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
master=self.tkconsole.text):
raise
else:
+ self.showtraceback()
else:
raise
except: