[Python-3000-checkins] r56301 - in python/branches/py3k-struni: Lib/lib-tk/ScrolledText.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Thu Jul 12 10:55:44 2007
New Revision: 56301

Modified:
   python/branches/py3k-struni/   (props changed)
   python/branches/py3k-struni/Lib/lib-tk/ScrolledText.py
Log:
Merged revisions 56265-56300 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/p3yk

........
  r56274 | georg.brandl | 2007-07-11 08:10:46 -0700 (Wed, 11 Jul 2007) | 2 lines
  
  Fix #1751965, typo in isinstance.
........


Modified: python/branches/py3k-struni/Lib/lib-tk/ScrolledText.py
==============================================================================
--- python/branches/py3k-struni/Lib/lib-tk/ScrolledText.py	(original)
+++ python/branches/py3k-struni/Lib/lib-tk/ScrolledText.py	Thu Jul 12 10:55:44 2007
@@ -21,7 +21,7 @@
             cnf = _cnfmerge((cnf, kw))
         fcnf = {}
         for k in cnf.keys():
-            if isinstace(k, type) or k == 'name':
+            if isinstance(k, type) or k == 'name':
                 fcnf[k] = cnf[k]
                 del cnf[k]
         self.frame = Frame(master, **fcnf)