diff -r be4bec689de3 Lib/lib-tk/test/runtktests.py --- a/Lib/lib-tk/test/runtktests.py Tue Mar 19 17:17:47 2013 -0700 +++ b/Lib/lib-tk/test/runtktests.py Wed Mar 20 12:49:51 2013 -0700 @@ -7,6 +7,7 @@ """ import os +import subprocess import sys import unittest import importlib @@ -23,28 +24,8 @@ if _tk_unavailable is None: _tk_unavailable = False if sys.platform == 'darwin': - # The Aqua Tk implementations on OS X can abort the process if - # being called in an environment where a window server connection - # cannot be made, for instance when invoked by a buildbot or ssh - # process not running under the same user id as the current console - # user. To avoid that, raise an exception if the window manager - # connection is not available. - from ctypes import cdll, c_int, pointer, Structure - from ctypes.util import find_library - - app_services = cdll.LoadLibrary(find_library("ApplicationServices")) - - if app_services.CGMainDisplayID() == 0: - _tk_unavailable = "cannot run without OS X window manager" - else: - class ProcessSerialNumber(Structure): - _fields_ = [("highLongOfPSN", c_int), - ("lowLongOfPSN", c_int)] - psn = ProcessSerialNumber() - psn_p = pointer(psn) - if ( (app_services.GetCurrentProcess(psn_p) < 0) or - (app_services.SetFrontProcess(psn_p) < 0) ): - _tk_unavailable = "cannot run without OS X gui process" + if subprocess.check_output(["launchctl", "managername"]).rstrip() != "Aqua": + _tk_unavailable = "not running under Aqua" else: # not OS X import Tkinter try: