Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2015-08-14 17:00:12 -04:00
commit fa02bc0d3f

View file

@ -69,7 +69,7 @@ def tabnanny(self, filename):
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)