summaryrefslogtreecommitdiff
path: root/Lib/idlelib/keybindingDialog.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-08-02 20:40:20 +0000
committerEzio Melotti <ezio.melotti@gmail.com>2010-08-02 20:40:20 +0000
commit4c6daf10372af41d4b48dd1ac65d737c64c2d41c (patch)
tree1c09beb9cb50131295da68818734d18e39b1941d /Lib/idlelib/keybindingDialog.py
parentb55d36805566c092c11b8e38792c759742cd6a1f (diff)
downloadcpython-git-4c6daf10372af41d4b48dd1ac65d737c64c2d41c.tar.gz
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 ........
Diffstat (limited to 'Lib/idlelib/keybindingDialog.py')
-rw-r--r--Lib/idlelib/keybindingDialog.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/keybindingDialog.py b/Lib/idlelib/keybindingDialog.py
index d6d1f18126..5339f88f61 100644
--- a/Lib/idlelib/keybindingDialog.py
+++ b/Lib/idlelib/keybindingDialog.py
@@ -132,7 +132,7 @@ class GetKeysDialog(Toplevel):
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 @@ class GetKeysDialog(Toplevel):
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)