@@ -182,7 +182,7 @@ def CreatePageHighlight(self):
182182 (' ','normal'),('stderr','stderr'),('\n','normal'))
183183 for txTa in textAndTags:
184184 text.insert(END,txTa[0],txTa[1])
185- for element in self.themeElements.keys() :
185+ for element in self.themeElements:
186186 text.tag_bind(self.themeElements[element][0],'<ButtonPress-1>',
187187 lambda event,elem=element: event.widget.winfo_toplevel()
188188 .highlightTarget.set(elem))
@@ -556,7 +556,7 @@ def AddChangedItem(self,type,section,item,value):
556556
557557 def GetDefaultItems(self):
558558 dItems={'main':{},'highlight':{},'keys':{},'extensions':{}}
559- for configType in dItems.keys() :
559+ for configType in dItems:
560560 sections=idleConf.GetSectionList('default',configType)
561561 for section in sections:
562562 dItems[configType][section]={}
@@ -597,11 +597,11 @@ def GetNewKeys(self):
597597 else:
598598 currentKeySetName=self.customKeys.get()
599599 currentBindings=idleConf.GetCurrentKeySet()
600- if currentKeySetName in self.changedItems['keys'].keys() : #unsaved changes
600+ if currentKeySetName in self.changedItems['keys']: #unsaved changes
601601 keySetChanges=self.changedItems['keys'][currentKeySetName]
602- for event in keySetChanges.keys() :
602+ for event in keySetChanges:
603603 currentBindings[event]=keySetChanges[event].split()
604- currentKeySequences= currentBindings.values()
604+ currentKeySequences = list( currentBindings.values() )
605605 newKeys=GetKeysDialog(self,'Get New Keys',bindName,
606606 currentKeySequences).result
607607 if newKeys: #new keys were specified
@@ -648,14 +648,14 @@ def CreateNewKeySet(self,newKeySetName):
648648 prevKeySetName=self.customKeys.get()
649649 prevKeys=idleConf.GetCoreKeys(prevKeySetName)
650650 newKeys={}
651- for event in prevKeys.keys() : #add key set to changed items
651+ for event in prevKeys: #add key set to changed items
652652 eventName=event[2:-2] #trim off the angle brackets
653653 binding=' '.join(prevKeys[event])
654654 newKeys[eventName]=binding
655655 #handle any unsaved changes to prev key set
656- if prevKeySetName in self.changedItems['keys'].keys() :
656+ if prevKeySetName in self.changedItems['keys']:
657657 keySetChanges=self.changedItems['keys'][prevKeySetName]
658- for event in keySetChanges.keys() :
658+ for event in keySetChanges:
659659 newKeys[event]=keySetChanges[event]
660660 #save the new theme
661661 self.SaveNewKeySet(newKeySetName,newKeys)
@@ -673,15 +673,15 @@ def LoadKeysList(self,keySetName):
673673 reselect=1
674674 listIndex=self.listBindings.index(ANCHOR)
675675 keySet=idleConf.GetKeySet(keySetName)
676- bindNames= keySet.keys()
676+ bindNames = list( keySet.keys() )
677677 bindNames.sort()
678678 self.listBindings.delete(0,END)
679679 for bindName in bindNames:
680680 key=' '.join(keySet[bindName]) #make key(s) into a string
681681 bindName=bindName[2:-2] #trim off the angle brackets
682- if keySetName in self.changedItems['keys'].keys() :
682+ if keySetName in self.changedItems['keys']:
683683 #handle any unsaved changes to this key set
684- if bindName in self.changedItems['keys'][keySetName].keys() :
684+ if bindName in self.changedItems['keys'][keySetName]:
685685 key=self.changedItems['keys'][keySetName][bindName]
686686 self.listBindings.insert(END, bindName+' - '+key)
687687 if reselect:
@@ -796,9 +796,9 @@ def CreateNewTheme(self,newThemeName):
796796 themeName=self.customTheme.get()
797797 newTheme=idleConf.GetThemeDict(themeType,themeName)
798798 #apply any of the old theme's unsaved changes to the new theme
799- if themeName in self.changedItems['highlight'].keys() :
799+ if themeName in self.changedItems['highlight']:
800800 themeChanges=self.changedItems['highlight'][themeName]
801- for element in themeChanges.keys() :
801+ for element in themeChanges:
802802 newTheme[element]=themeChanges[element]
803803 #save the new theme
804804 self.SaveNewTheme(newThemeName,newTheme)
@@ -850,14 +850,14 @@ def PaintThemeSample(self):
850850 theme=self.builtinTheme.get()
851851 else: #a user theme
852852 theme=self.customTheme.get()
853- for elementTitle in self.themeElements.keys() :
853+ for elementTitle in self.themeElements:
854854 element=self.themeElements[elementTitle][0]
855855 colours=idleConf.GetHighlight(theme,element)
856856 if element=='cursor': #cursor sample needs special painting
857857 colours['background']=idleConf.GetHighlight(theme,
858858 'normal', fgBg='bg')
859859 #handle any unsaved changes to this theme
860- if theme in self.changedItems['highlight'].keys() :
860+ if theme in self.changedItems['highlight']:
861861 themeDict=self.changedItems['highlight'][theme]
862862 if element+'-foreground' in themeDict:
863863 colours['foreground']=themeDict[element+'-foreground']
@@ -976,7 +976,7 @@ def LoadThemeCfg(self):
976976 self.optMenuThemeBuiltin.SetMenu(itemList,itemList[0])
977977 self.SetThemeType()
978978 ##load theme element option menu
979- themeNames= self.themeElements.keys()
979+ themeNames = list( self.themeElements.keys() )
980980 themeNames.sort(self.__ThemeNameIndexCompare)
981981 self.optMenuHighlightTarget.SetMenu(themeNames,themeNames[0])
982982 self.PaintThemeSample()
@@ -1061,7 +1061,7 @@ def SaveNewKeySet(self,keySetName,keySet):
10611061 """
10621062 if not idleConf.userCfg['keys'].has_section(keySetName):
10631063 idleConf.userCfg['keys'].add_section(keySetName)
1064- for event in keySet.keys() :
1064+ for event in keySet:
10651065 value=keySet[event]
10661066 idleConf.userCfg['keys'].SetOption(keySetName,event,value)
10671067
@@ -1073,7 +1073,7 @@ def SaveNewTheme(self,themeName,theme):
10731073 """
10741074 if not idleConf.userCfg['highlight'].has_section(themeName):
10751075 idleConf.userCfg['highlight'].add_section(themeName)
1076- for element in theme.keys() :
1076+ for element in theme:
10771077 value=theme[element]
10781078 idleConf.userCfg['highlight'].SetOption(themeName,element,value)
10791079
@@ -1088,14 +1088,14 @@ def SetUserValue(self,configType,section,item,value):
10881088 def SaveAllChangedConfigs(self):
10891089 "Save configuration changes to the user config file."
10901090 idleConf.userCfg['main'].Save()
1091- for configType in self.changedItems.keys() :
1091+ for configType in self.changedItems:
10921092 cfgTypeHasChanges = False
1093- for section in self.changedItems[configType].keys() :
1093+ for section in self.changedItems[configType]:
10941094 if section == 'HelpFiles':
10951095 #this section gets completely replaced
10961096 idleConf.userCfg['main'].remove_section('HelpFiles')
10971097 cfgTypeHasChanges = True
1098- for item in self.changedItems[configType][section].keys() :
1098+ for item in self.changedItems[configType][section]:
10991099 value = self.changedItems[configType][section][item]
11001100 if self.SetUserValue(configType,section,item,value):
11011101 cfgTypeHasChanges = True
@@ -1109,13 +1109,13 @@ def SaveAllChangedConfigs(self):
11091109 def DeactivateCurrentConfig(self):
11101110 #Before a config is saved, some cleanup of current
11111111 #config must be done - remove the previous keybindings
1112- winInstances= self.parent.instance_dict.keys()
1112+ winInstances = self.parent.instance_dict.keys()
11131113 for instance in winInstances:
11141114 instance.RemoveKeybindings()
11151115
11161116 def ActivateConfigChanges(self):
11171117 "Dynamically apply configuration changes"
1118- winInstances= self.parent.instance_dict.keys()
1118+ winInstances = self.parent.instance_dict.keys()
11191119 for instance in winInstances:
11201120 instance.ResetColorizer()
11211121 instance.ResetFont()
0 commit comments