[Python-checkins] r79577 - in python/trunk/Lib/idlelib: configDialog.py configHandler.py
florent.xicluna
python-checkins at python.org
Fri Apr 2 10:15:26 CEST 2010
Author: florent.xicluna
Date: Fri Apr 2 10:15:26 2010
New Revision: 79577
Log:
#7092: Drop the cmp argument.
Modified:
python/trunk/Lib/idlelib/configDialog.py
python/trunk/Lib/idlelib/configHandler.py
Modified: python/trunk/Lib/idlelib/configDialog.py
==============================================================================
--- python/trunk/Lib/idlelib/configDialog.py (original)
+++ python/trunk/Lib/idlelib/configDialog.py Fri Apr 2 10:15:26 2010
@@ -989,16 +989,11 @@
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',
Modified: python/trunk/Lib/idlelib/configHandler.py
==============================================================================
--- python/trunk/Lib/idlelib/configHandler.py (original)
+++ python/trunk/Lib/idlelib/configHandler.py Fri Apr 2 10:15:26 2010
@@ -654,17 +654,9 @@
helpPath=value[1].strip()
if menuItem and helpPath: #neither are empty strings
helpSources.append( (menuItem,helpPath,option) )
- helpSources.sort(self.__helpsort)
+ helpSources.sort(key=lambda x: int(x[2]))
return helpSources
- def __helpsort(self, h1, h2):
- if int(h1[2]) < int(h2[2]):
- return -1
- elif int(h1[2]) > int(h2[2]):
- return 1
- else:
- return 0
-
def GetAllExtraHelpSourcesList(self):
"""
Returns a list of tuples containing the details of all additional help
More information about the Python-checkins
mailing list