summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-05-02 15:52:12 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-05-02 15:52:12 (GMT)
commitcb2ad801ac2bbee4f72c935e7fa57cc5b50382f2 (patch)
tree0e8259f67d9822ef787239772fd26b59842b6271 /Lib/tkinter
parent6b7786bac2feed64b14344cdac9ea0ead24efd78 (diff)
parentceced6bfead67f81cafad47c950e0769e1ba6db0 (diff)
downloadcpython-cb2ad801ac2bbee4f72c935e7fa57cc5b50382f2.zip
cpython-cb2ad801ac2bbee4f72c935e7fa57cc5b50382f2.tar.gz
cpython-cb2ad801ac2bbee4f72c935e7fa57cc5b50382f2.tar.bz2
Closes #18604: Merge with 3.4
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/test/support.py46
1 files changed, 2 insertions, 44 deletions
diff --git a/Lib/tkinter/test/support.py b/Lib/tkinter/test/support.py
index fcd9ffc..7ae0cbb 100644
--- a/Lib/tkinter/test/support.py
+++ b/Lib/tkinter/test/support.py
@@ -1,52 +1,10 @@
import sys
import tkinter
import unittest
-
-_tk_unavailable = None
-
-def check_tk_availability():
- """Check that Tk is installed and available."""
- global _tk_unavailable
-
- 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"
- else: # not OS X
- import tkinter
- try:
- tkinter.Button()
- except tkinter.TclError as msg:
- # assuming tk is not available
- _tk_unavailable = "tk not available: %s" % msg
-
- if _tk_unavailable:
- raise unittest.SkipTest(_tk_unavailable)
- return
+from test.support import requires
def get_tk_root():
- check_tk_availability() # raise exception if tk unavailable
+ requires('gui') # raise exception if tk unavailable
try:
root = tkinter._default_root
except AttributeError: