[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5
terry.reedy
python-checkins at python.org
Fri Aug 14 23:00:31 CEST 2015
https://hg.python.org/cpython/rev/310ec12daa7d
changeset: 97388:310ec12daa7d
parent: 97384:c0b7829e3074
parent: 97387:69a8b05f27b4
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Aug 14 17:00:12 2015 -0400
summary:
Merge with 3.5
files:
Lib/idlelib/ScriptBinding.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
--- a/Lib/idlelib/ScriptBinding.py
+++ b/Lib/idlelib/ScriptBinding.py
@@ -69,7 +69,7 @@
try:
tabnanny.process_tokens(tokenize.generate_tokens(f.readline))
except tokenize.TokenError as msg:
- msgtxt, (lineno, start) = msg
+ msgtxt, (lineno, start) = msg.args
self.editwin.gotoline(lineno)
self.errorbox("Tabnanny Tokenizing Error",
"Token Error: %s" % msgtxt)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list