More 2to3 fixes in the Tools directory. Fixes #2893.

Tools/modulator/ScrolledListbox.py

@@ -19,7 +19,7 @@ class ScrolledListbox(Listbox):
         fcnf = {}
         vcnf = {'name': 'vbar',
             Pack: {'side': 'right', 'fill': 'y'},}
-        for k in cnf.keys():
+        for k in list(cnf.keys()):
             if type(k) == ClassType or k == 'name':
                 fcnf[k] = cnf[k]
                 del cnf[k]
@@ -32,6 +32,6 @@ class ScrolledListbox(Listbox):
         self.vbar['command'] = (self, 'yview')
 
         # Copy Pack methods of self.frame -- hack!
-        for m in Pack.__dict__.keys():
+        for m in Pack.__dict__:
             if m[0] != '_' and m != 'config':
                 setattr(self, m, getattr(self.frame, m))

Tools/modulator/genmodule.py

@@ -40,7 +40,7 @@ class writer:
 
     def makesubst(self):
         if not self._subst:
-            if not self.__dict__.has_key('abbrev'):
+            if 'abbrev' not in self.__dict__:
                 self.abbrev = self.name
             self.Abbrev = self.abbrev[0].upper()+self.abbrev[1:]
             subst = varsubst.Varsubst(self.__dict__)

Tools/modulator/modulator.py

@@ -17,7 +17,7 @@
 #
 
 import sys, os
-if os.name <> 'mac':
+if os.name != 'mac':
     sys.path.append(os.path.join(os.environ['HOME'],
                                  'src/python/Tools/modulator'))
 

Tools/modulator/varsubst.py

@@ -28,7 +28,7 @@ class Varsubst:
                 s = s[2:]
                 continue
             name = m.group(1)
-            if not self.dict.has_key(name):
+            if name not in self.dict:
                 raise error('No such variable: '+name)
             value = self.dict[name]
             if self.do_useindent and '\n' in value: