summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/ScriptBinding.py
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2002-09-18 03:05:19 (GMT)
committerKurt B. Kaiser <kbk@shore.net>2002-09-18 03:05:19 (GMT)
commit05bab1ee938f4afacbbd43a9bd21578382fe4717 (patch)
treeaf37a82c6af4e13ae1b52f03f5af072465fd0153 /Lib/idlelib/ScriptBinding.py
parentce86b10eb8121481e2d59230d044d61c28243aeb (diff)
downloadcpython-05bab1ee938f4afacbbd43a9bd21578382fe4717.zip
cpython-05bab1ee938f4afacbbd43a9bd21578382fe4717.tar.gz
cpython-05bab1ee938f4afacbbd43a9bd21578382fe4717.tar.bz2
Merge Py Idle changes:
Rev 1.11 GvR Fix for SF bug #448835. Fix this to work with the new (still undocumented) tabnanny API. I'm afraid Stephen will have to add this fix to the IDLE fork code base as well. Rev 1.12 rhettinger (skip, done differently in Idlefork) Rev 1.13 time_one (skip, NA)
Diffstat (limited to 'Lib/idlelib/ScriptBinding.py')
-rw-r--r--Lib/idlelib/ScriptBinding.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
index cc26510..c24bf81 100644
--- a/Lib/idlelib/ScriptBinding.py
+++ b/Lib/idlelib/ScriptBinding.py
@@ -65,10 +65,9 @@ class ScriptBinding:
def tabnanny(self, filename):
import tabnanny
import tokenize
- tabnanny.reset_globals()
f = open(filename, 'r')
try:
- tokenize.tokenize(f.readline, tabnanny.tokeneater)
+ tabnanny.process_tokens(tokenize.generate_tokens(f.readline))
except tokenize.TokenError, msg:
self.errorbox("Token error",
"Token error:\n%s" % str(msg))