summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/MultiCall.py
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-03-28 03:51:15 (GMT)
committerNed Deily <nad@acm.org>2014-03-28 03:51:15 (GMT)
commitc318288f69e11c537baeca6799c212e8dd294b85 (patch)
tree61db5fc96166290d16cfb529945086cadd935ac7 /Lib/idlelib/MultiCall.py
parent090eb1fd18f7cdd753b6fc9b60162491ee48f04e (diff)
parentb7601676b07c7c8e79af9e7818a783b966612c34 (diff)
downloadcpython-c318288f69e11c537baeca6799c212e8dd294b85.zip
cpython-c318288f69e11c537baeca6799c212e8dd294b85.tar.gz
cpython-c318288f69e11c537baeca6799c212e8dd294b85.tar.bz2
Issue #17654: merge from 3.4
Diffstat (limited to 'Lib/idlelib/MultiCall.py')
-rw-r--r--Lib/idlelib/MultiCall.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/idlelib/MultiCall.py b/Lib/idlelib/MultiCall.py
index 25105dc..cc6bffd 100644
--- a/Lib/idlelib/MultiCall.py
+++ b/Lib/idlelib/MultiCall.py
@@ -32,7 +32,6 @@ Each function will be called at most once for each event.
import sys
import re
import tkinter
-from idlelib import macosxSupport
# the event type constants, which define the meaning of mc_type
MC_KEYPRESS=0; MC_KEYRELEASE=1; MC_BUTTONPRESS=2; MC_BUTTONRELEASE=3;
@@ -45,7 +44,7 @@ MC_SHIFT = 1<<0; MC_CONTROL = 1<<2; MC_ALT = 1<<3; MC_META = 1<<5
MC_OPTION = 1<<6; MC_COMMAND = 1<<7
# define the list of modifiers, to be used in complex event types.
-if macosxSupport.runningAsOSXApp():
+if sys.platform == "darwin":
_modifiers = (("Shift",), ("Control",), ("Option",), ("Command",))
_modifier_masks = (MC_SHIFT, MC_CONTROL, MC_OPTION, MC_COMMAND)
else: