Merged revisions 79576-79578 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79576 | florent.xicluna | 2010-04-02 10:24:52 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: Fix additional "-3" warnings in the idlelib package, and convert to absolute imports.
........
  r79577 | florent.xicluna | 2010-04-02 11:15:26 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: Drop the cmp argument.
........
  r79578 | florent.xicluna | 2010-04-02 11:30:21 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: silence some py3k warnings
........
This commit is contained in:
Ezio Melotti 2010-08-02 20:40:20 +00:00
parent b55d368055
commit 4c6daf1037
37 changed files with 173 additions and 166 deletions

View file

@ -13,13 +13,13 @@ from Tkinter import *
import tkMessageBox, tkColorChooser, tkFont
import string
from configHandler import idleConf
from dynOptionMenuWidget import DynOptionMenu
from tabbedpages import TabbedPageSet
from keybindingDialog import GetKeysDialog
from configSectionNameDialog import GetCfgSectionNameDialog
from configHelpSourceEdit import GetHelpSourceDialog
import macosxSupport
from idlelib.configHandler import idleConf
from idlelib.dynOptionMenuWidget import DynOptionMenu
from idlelib.tabbedpages import TabbedPageSet
from idlelib.keybindingDialog import GetKeysDialog
from idlelib.configSectionNameDialog import GetCfgSectionNameDialog
from idlelib.configHelpSourceEdit import GetHelpSourceDialog
from idlelib import macosxSupport
class ConfigDialog(Toplevel):
@ -988,16 +988,11 @@ class ConfigDialog(Toplevel):
self.SetThemeType()
##load theme element option menu
themeNames=self.themeElements.keys()
themeNames.sort(self.__ThemeNameIndexCompare)
themeNames.sort(key=lambda x: self.themeElements[x][1])
self.optMenuHighlightTarget.SetMenu(themeNames,themeNames[0])
self.PaintThemeSample()
self.SetHighlightTarget()
def __ThemeNameIndexCompare(self,a,b):
if self.themeElements[a][1]<self.themeElements[b][1]: return -1
elif self.themeElements[a][1]==self.themeElements[b][1]: return 0
else: return 1
def LoadKeyCfg(self):
##current keys type radiobutton
self.keysAreBuiltin.set(idleConf.GetOption('main','Keys','default',