From: Kurt B. Kaiser <kbk@shore.net>
Date: Wed, 18 Sep 2002 03:05:19 +0000 (+0000)
Subject: Merge Py Idle changes:
X-Git-Tag: v2.3c1~4036
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05bab1ee938f4afacbbd43a9bd21578382fe4717;p=thirdparty%2FPython%2Fcpython.git

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)
---

diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
index cc265101a5a7..c24bf81204e6 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))