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
........
diff --git a/Lib/idlelib/keybindingDialog.py b/Lib/idlelib/keybindingDialog.py
index d6d1f18..5339f88 100644
--- a/Lib/idlelib/keybindingDialog.py
+++ b/Lib/idlelib/keybindingDialog.py
@@ -132,7 +132,7 @@
order is also important: key binding equality depends on it, so
config-keys.def must use the same ordering.
"""
- import macosxSupport
+ from idlelib import macosxSupport
if macosxSupport.runningAsOSXApp():
self.modifiers = ['Shift', 'Control', 'Option', 'Command']
else:
@@ -167,7 +167,7 @@
def GetModifiers(self):
modList = [variable.get() for variable in self.modifier_vars]
- return filter(None, modList)
+ return [mod for mod in modList if mod]
def ClearKeySeq(self):
self.listKeysFinal.select_clear(0,END)