Thu Aug 23 07:26:03 CEST 2007

Author: kurt.kaiser
Date: Thu Aug 23 07:25:55 2007
New Revision: 57312

Modified:
   python/branches/py3k/Lib/idlelib/ColorDelegator.py
   python/branches/py3k/Lib/idlelib/Debugger.py
   python/branches/py3k/Lib/idlelib/Delegator.py
   python/branches/py3k/Lib/idlelib/EditorWindow.py
   python/branches/py3k/Lib/idlelib/ObjectBrowser.py
   python/branches/py3k/Lib/idlelib/PyShell.py
   python/branches/py3k/Lib/idlelib/RemoteDebugger.py
   python/branches/py3k/Lib/idlelib/StackViewer.py
   python/branches/py3k/Lib/idlelib/WindowList.py
   python/branches/py3k/Lib/idlelib/configDialog.py
   python/branches/py3k/Lib/idlelib/configHandler.py
   python/branches/py3k/Lib/idlelib/dynOptionMenuWidget.py
   python/branches/py3k/Lib/idlelib/keybindingDialog.py
   python/branches/py3k/Lib/idlelib/tabpage.py
Log:
Conform to py3k dict.{keys, items, values} with some advice from 2b3

M    idlelib/configHandler.py
M    idlelib/ColorDelegator.py
M    idlelib/Delegator.py
M    idlelib/ObjectBrowser.py
M    idlelib/PyShell.py
M    idlelib/Debugger.py
M    idlelib/configDialog.py
M    idlelib/StackViewer.py
M    idlelib/keybindingDialog.py
M    idlelib/tabpage.py
M    idlelib/EditorWindow.py
M    idlelib/WindowList.py
M    idlelib/RemoteDebugger.py
M    idlelib/dynOptionMenuWidget.py


Modified: python/branches/py3k/Lib/idlelib/ColorDelegator.py
==============================================================================

--- python/branches/py3k/Lib/idlelib/ColorDelegator.py	(original)
+++ python/branches/py3k/Lib/idlelib/ColorDelegator.py	Thu Aug 23 07:25:55 2007
@@ -190,7 +190,7 @@
                 ##print head, "get", mark, next, "->", repr(line)
                 if not line:
                     return
-                for tag in self.tagdefs.keys():
+                for tag in self.tagdefs:
                     self.tag_remove(tag, mark, next)
                 chars = chars + line
                 m = self.prog.search(chars)
@@ -244,7 +244,7 @@
                     return
 
     def removecolors(self):
-        for tag in self.tagdefs.keys():
+        for tag in self.tagdefs:
             self.tag_remove(tag, "1.0", "end")
 
 def main():

Modified: python/branches/py3k/Lib/idlelib/Debugger.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/Debugger.py	(original)
+++ python/branches/py3k/Lib/idlelib/Debugger.py	Thu Aug 23 07:25:55 2007
@@ -312,8 +312,7 @@
 
     def load_breakpoints(self):
         "Load PyShellEditorWindow breakpoints into subprocess debugger"
-        pyshell_edit_windows = self.pyshell.flist.inversedict.keys()
-        for editwin in pyshell_edit_windows:
+        for editwin in self.pyshell.flist.inversedict:
             filename = editwin.io.filename
             try:
                 for lineno in editwin.breakpoints:

Modified: python/branches/py3k/Lib/idlelib/Delegator.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/Delegator.py	(original)
+++ python/branches/py3k/Lib/idlelib/Delegator.py	Thu Aug 23 07:25:55 2007
@@ -13,7 +13,7 @@
         return attr
 
     def resetcache(self):
-        for key in self.__cache.keys():
+        for key in self.__cache:
             try:
                 delattr(self, key)
             except AttributeError:
@@ -21,7 +21,7 @@
         self.__cache.clear()
 
     def cachereport(self):
-        keys = self.__cache.keys()
+        keys = list(self.__cache.keys())
         keys.sort()
         print(keys)
 

Modified: python/branches/py3k/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/EditorWindow.py	(original)
+++ python/branches/py3k/Lib/idlelib/EditorWindow.py	Thu Aug 23 07:25:55 2007
@@ -654,7 +654,7 @@
             for item in menu[1]:
                 if item:
                     menuEventDict[menu[0]][prepstr(item[0])[1]] = item[1]
-        for menubarItem in self.menudict.keys():
+        for menubarItem in self.menudict:
             menu = self.menudict[menubarItem]
             end = menu.index(END) + 1
             for index in range(0, end):
@@ -733,7 +733,7 @@
         finally:
             rf_file.close()
         # for each edit window instance, construct the recent files menu
-        for instance in self.top.instance_dict.keys():
+        for instance in self.top.instance_dict:
             menu = instance.recent_files_menu
             menu.delete(1, END)  # clear, and rebuild:
             for i, file in zip(count(), rf_list):
@@ -863,7 +863,7 @@
         self.load_standard_extensions()
 
     def unload_extensions(self):
-        for ins in self.extensions.values():
+        for ins in list(self.extensions.values()):
             if hasattr(ins, "close"):
                 ins.close()
         self.extensions = {}
@@ -893,7 +893,7 @@
         self.extensions[name] = ins
         if keydefs:
             self.apply_bindings(keydefs)
-            for vevent in keydefs.keys():
+            for vevent in keydefs:
                 methodname = vevent.replace("-", "_")
                 while methodname[:1] == '<':
                     methodname = methodname[1:]

Modified: python/branches/py3k/Lib/idlelib/ObjectBrowser.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/ObjectBrowser.py	(original)
+++ python/branches/py3k/Lib/idlelib/ObjectBrowser.py	Thu Aug 23 07:25:55 2007
@@ -94,7 +94,7 @@
 
 class DictTreeItem(SequenceTreeItem):
     def keys(self):
-        keys = self.object.keys()
+        keys = list(self.object.keys())
         try:
             keys.sort()
         except:

Modified: python/branches/py3k/Lib/idlelib/PyShell.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/PyShell.py	(original)
+++ python/branches/py3k/Lib/idlelib/PyShell.py	Thu Aug 23 07:25:55 2007
@@ -84,7 +84,7 @@
     """
     cache = linecache.cache
     save = {}
-    for filename in cache.keys():
+    for filename in cache:
         if filename[:1] + filename[-1:] == '<>':
             save[filename] = cache[filename]
     orig_checkcache()

Modified: python/branches/py3k/Lib/idlelib/RemoteDebugger.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/RemoteDebugger.py	(original)
+++ python/branches/py3k/Lib/idlelib/RemoteDebugger.py	Thu Aug 23 07:25:55 2007
@@ -163,7 +163,7 @@
 
     def dict_keys(self, did):
         dict = dicttable[did]
-        return dict.keys()
+        return list(dict.keys())
 
     def dict_item(self, did, key):
         dict = dicttable[did]

Modified: python/branches/py3k/Lib/idlelib/StackViewer.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/StackViewer.py	(original)
+++ python/branches/py3k/Lib/idlelib/StackViewer.py	Thu Aug 23 07:25:55 2007
@@ -106,7 +106,7 @@
         return len(self.object) > 0
 
     def keys(self):
-        return self.object.keys()
+        return list(self.object.keys())
 
     def GetSubList(self):
         sublist = []

Modified: python/branches/py3k/Lib/idlelib/WindowList.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/WindowList.py	(original)
+++ python/branches/py3k/Lib/idlelib/WindowList.py	Thu Aug 23 07:25:55 2007
@@ -20,7 +20,7 @@
 
     def add_windows_to_menu(self,  menu):
         list = []
-        for key in self.dict.keys():
+        for key in self.dict:
             window = self.dict[key]
             try:
                 title = window.get_title()

Modified: python/branches/py3k/Lib/idlelib/configDialog.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/configDialog.py	(original)
+++ python/branches/py3k/Lib/idlelib/configDialog.py	Thu Aug 23 07:25:55 2007
@@ -182,7 +182,7 @@
             (' ','normal'),('stderr','stderr'),('\n','normal'))
         for txTa in textAndTags:
             text.insert(END,txTa[0],txTa[1])
-        for element in self.themeElements.keys():
+        for element in self.themeElements:
             text.tag_bind(self.themeElements[element][0],'<ButtonPress-1>',
                 lambda event,elem=element: event.widget.winfo_toplevel()
                 .highlightTarget.set(elem))
@@ -556,7 +556,7 @@
 
     def GetDefaultItems(self):
         dItems={'main':{},'highlight':{},'keys':{},'extensions':{}}
-        for configType in dItems.keys():
+        for configType in dItems:
             sections=idleConf.GetSectionList('default',configType)
             for section in sections:
                 dItems[configType][section]={}
@@ -597,11 +597,11 @@
         else:
             currentKeySetName=self.customKeys.get()
         currentBindings=idleConf.GetCurrentKeySet()
-        if currentKeySetName in self.changedItems['keys'].keys(): #unsaved changes
+        if currentKeySetName in self.changedItems['keys']: #unsaved changes
             keySetChanges=self.changedItems['keys'][currentKeySetName]
-            for event in keySetChanges.keys():
+            for event in keySetChanges:
                 currentBindings[event]=keySetChanges[event].split()
-        currentKeySequences=currentBindings.values()
+        currentKeySequences = list(currentBindings.values())
         newKeys=GetKeysDialog(self,'Get New Keys',bindName,
                 currentKeySequences).result
         if newKeys: #new keys were specified
@@ -648,14 +648,14 @@
             prevKeySetName=self.customKeys.get()
         prevKeys=idleConf.GetCoreKeys(prevKeySetName)
         newKeys={}
-        for event in prevKeys.keys(): #add key set to changed items
+        for event in prevKeys: #add key set to changed items
             eventName=event[2:-2] #trim off the angle brackets
             binding=' '.join(prevKeys[event])
             newKeys[eventName]=binding
         #handle any unsaved changes to prev key set
-        if prevKeySetName in self.changedItems['keys'].keys():
+        if prevKeySetName in self.changedItems['keys']:
             keySetChanges=self.changedItems['keys'][prevKeySetName]
-            for event in keySetChanges.keys():
+            for event in keySetChanges:
                 newKeys[event]=keySetChanges[event]
         #save the new theme
         self.SaveNewKeySet(newKeySetName,newKeys)
@@ -673,15 +673,15 @@
             reselect=1
             listIndex=self.listBindings.index(ANCHOR)
         keySet=idleConf.GetKeySet(keySetName)
-        bindNames=keySet.keys()
+        bindNames = list(keySet.keys())
         bindNames.sort()
         self.listBindings.delete(0,END)
         for bindName in bindNames:
             key=' '.join(keySet[bindName]) #make key(s) into a string
             bindName=bindName[2:-2] #trim off the angle brackets
-            if keySetName in self.changedItems['keys'].keys():
+            if keySetName in self.changedItems['keys']:
                 #handle any unsaved changes to this key set
-                if bindName in self.changedItems['keys'][keySetName].keys():
+                if bindName in self.changedItems['keys'][keySetName]:
                     key=self.changedItems['keys'][keySetName][bindName]
             self.listBindings.insert(END, bindName+' - '+key)
         if reselect:
@@ -796,9 +796,9 @@
             themeName=self.customTheme.get()
         newTheme=idleConf.GetThemeDict(themeType,themeName)
         #apply any of the old theme's unsaved changes to the new theme
-        if themeName in self.changedItems['highlight'].keys():
+        if themeName in self.changedItems['highlight']:
             themeChanges=self.changedItems['highlight'][themeName]
-            for element in themeChanges.keys():
+            for element in themeChanges:
                 newTheme[element]=themeChanges[element]
         #save the new theme
         self.SaveNewTheme(newThemeName,newTheme)
@@ -850,14 +850,14 @@
             theme=self.builtinTheme.get()
         else: #a user theme
             theme=self.customTheme.get()
-        for elementTitle in self.themeElements.keys():
+        for elementTitle in self.themeElements:
             element=self.themeElements[elementTitle][0]
             colours=idleConf.GetHighlight(theme,element)
             if element=='cursor': #cursor sample needs special painting
                 colours['background']=idleConf.GetHighlight(theme,
                         'normal', fgBg='bg')
             #handle any unsaved changes to this theme
-            if theme in self.changedItems['highlight'].keys():
+            if theme in self.changedItems['highlight']:
                 themeDict=self.changedItems['highlight'][theme]
                 if element+'-foreground' in themeDict:
                     colours['foreground']=themeDict[element+'-foreground']
@@ -976,7 +976,7 @@
             self.optMenuThemeBuiltin.SetMenu(itemList,itemList[0])
         self.SetThemeType()
         ##load theme element option menu
-        themeNames=self.themeElements.keys()
+        themeNames = list(self.themeElements.keys())
         themeNames.sort(self.__ThemeNameIndexCompare)
         self.optMenuHighlightTarget.SetMenu(themeNames,themeNames[0])
         self.PaintThemeSample()
@@ -1061,7 +1061,7 @@
         """
         if not idleConf.userCfg['keys'].has_section(keySetName):
             idleConf.userCfg['keys'].add_section(keySetName)
-        for event in keySet.keys():
+        for event in keySet:
             value=keySet[event]
             idleConf.userCfg['keys'].SetOption(keySetName,event,value)
 
@@ -1073,7 +1073,7 @@
         """
         if not idleConf.userCfg['highlight'].has_section(themeName):
             idleConf.userCfg['highlight'].add_section(themeName)
-        for element in theme.keys():
+        for element in theme:
             value=theme[element]
             idleConf.userCfg['highlight'].SetOption(themeName,element,value)
 
@@ -1088,14 +1088,14 @@
     def SaveAllChangedConfigs(self):
         "Save configuration changes to the user config file."
         idleConf.userCfg['main'].Save()
-        for configType in self.changedItems.keys():
+        for configType in self.changedItems:
             cfgTypeHasChanges = False
-            for section in self.changedItems[configType].keys():
+            for section in self.changedItems[configType]:
                 if section == 'HelpFiles':
                     #this section gets completely replaced
                     idleConf.userCfg['main'].remove_section('HelpFiles')
                     cfgTypeHasChanges = True
-                for item in self.changedItems[configType][section].keys():
+                for item in self.changedItems[configType][section]:
                     value = self.changedItems[configType][section][item]
                     if self.SetUserValue(configType,section,item,value):
                         cfgTypeHasChanges = True
@@ -1109,13 +1109,13 @@
     def DeactivateCurrentConfig(self):
         #Before a config is saved, some cleanup of current
         #config must be done - remove the previous keybindings
-        winInstances=self.parent.instance_dict.keys()
+        winInstances = self.parent.instance_dict.keys()
         for instance in winInstances:
             instance.RemoveKeybindings()
 
     def ActivateConfigChanges(self):
         "Dynamically apply configuration changes"
-        winInstances=self.parent.instance_dict.keys()
+        winInstances = self.parent.instance_dict.keys()
         for instance in winInstances:
             instance.ResetColorizer()
             instance.ResetFont()

Modified: python/branches/py3k/Lib/idlelib/configHandler.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/configHandler.py	(original)
+++ python/branches/py3k/Lib/idlelib/configHandler.py	Thu Aug 23 07:25:55 2007
@@ -343,7 +343,7 @@
                 'stderr-background':'#ffffff',
                 'console-foreground':'#000000',
                 'console-background':'#ffffff' }
-        for element in theme.keys():
+        for element in theme:
             if not cfgParser.has_option(themeName,element):
                 #we are going to return a default, print warning
                 warning=('\n Warning: configHandler.py - IdleConf.GetThemeDict'
@@ -424,7 +424,7 @@
         extName=None
         vEvent='<<'+virtualEvent+'>>'
         for extn in self.GetExtensions(active_only=0):
-            for event in self.GetExtensionKeys(extn).keys():
+            for event in self.GetExtensionKeys(extn):
                 if event == vEvent:
                     extName=extn
         return extName
@@ -519,7 +519,7 @@
         for extn in activeExtns:
             extKeys=self.__GetRawExtensionKeys(extn)
             if extKeys: #the extension defines keybindings
-                for event in extKeys.keys():
+                for event in extKeys:
                     if extKeys[event] in keySet.values():
                         #the binding is already in use
                         extKeys[event]='' #disable this binding
@@ -532,7 +532,7 @@
         virtualEvent - string, name of the virtual event to test for, without
                        the enclosing '<< >>'
         """
-        return ('<<'+virtualEvent+'>>') in self.GetCoreKeys().keys()
+        return ('<<'+virtualEvent+'>>') in self.GetCoreKeys()
 
     def GetCoreKeys(self, keySetName=None):
         """
@@ -595,7 +595,7 @@
             '<<del-word-right>>': ['<Control-Key-Delete>']
             }
         if keySetName:
-            for event in keyBindings.keys():
+            for event in keyBindings:
                 binding=self.GetKeyBinding(keySetName,event)
                 if binding:
                     keyBindings[event]=binding
@@ -662,7 +662,7 @@
         """
         load all configuration files.
         """
-        for key in self.defaultCfg.keys():
+        for key in self.defaultCfg:
             self.defaultCfg[key].Load()
             self.userCfg[key].Load() #same keys
 
@@ -670,7 +670,7 @@
         """
         write all loaded user configuration files back to disk
         """
-        for key in self.userCfg.keys():
+        for key in self.userCfg:
             self.userCfg[key].Save()
 
 idleConf=IdleConf()
@@ -679,7 +679,7 @@
 if __name__ == '__main__':
     def dumpCfg(cfg):
         print('\n',cfg,'\n')
-        for key in cfg.keys():
+        for key in cfg:
             sections=cfg[key].sections()
             print(key)
             print(sections)

Modified: python/branches/py3k/Lib/idlelib/dynOptionMenuWidget.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/dynOptionMenuWidget.py	(original)
+++ python/branches/py3k/Lib/idlelib/dynOptionMenuWidget.py	Thu Aug 23 07:25:55 2007
@@ -13,7 +13,7 @@
     def __init__(self, master, variable, value, *values, **kwargs):
         #get a copy of kwargs before OptionMenu.__init__ munges them
         kwargsCopy=copy.copy(kwargs)
-        if 'highlightthickness' in kwargs.keys():
+        if 'highlightthickness' in list(kwargs.keys()):
             del(kwargs['highlightthickness'])
         OptionMenu.__init__(self, master, variable, value, *values, **kwargs)
         self.config(highlightthickness=kwargsCopy.get('highlightthickness'))

Modified: python/branches/py3k/Lib/idlelib/keybindingDialog.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/keybindingDialog.py	(original)
+++ python/branches/py3k/Lib/idlelib/keybindingDialog.py	Thu Aug 23 07:25:55 2007
@@ -203,7 +203,7 @@
                 '/':'slash','?':'question','Page Up':'Prior','Page Down':'Next',
                 'Left Arrow':'Left','Right Arrow':'Right','Up Arrow':'Up',
                 'Down Arrow': 'Down', 'Tab':'Tab'}
-        if key in translateDict.keys():
+        if key in translateDict:
             key = translateDict[key]
         if 'Shift' in modifiers and key in string.ascii_lowercase:
             key = key.upper()

Modified: python/branches/py3k/Lib/idlelib/tabpage.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/tabpage.py	(original)
+++ python/branches/py3k/Lib/idlelib/tabpage.py	Thu Aug 23 07:25:55 2007
@@ -43,12 +43,12 @@
 
     def ChangePage(self,pageName=None):
         if pageName:
-            if pageName in self.pages.keys():
+            if pageName in self.pages:
                 self.activePage.set(pageName)
             else:
                 raise InvalidTabPage('Invalid TabPage Name')
         ## pop up the active 'tab' only
-        for page in self.pages.keys():
+        for page in self.pages:
             self.pages[page]['tab'].config(relief=RIDGE)
         self.pages[self.GetActivePage()]['tab'].config(relief=RAISED)
         ## switch page
@@ -73,7 +73,7 @@
             self.ChangePage()
 
     def RemovePage(self,pageName):
-        if not pageName in self.pages.keys():
+        if not pageName in self.pages:
             raise InvalidTabPage('Invalid TabPage Name')
         self.pages[pageName]['tab'].pack_forget()
         self.pages[pageName]['page'].grid_forget()
