Kaydet (Commit) 4847f319 authored tarafından Terry Jan Reedy's avatar Terry Jan Reedy

Merge with 3.5

...@@ -466,6 +466,7 @@ def _is_gui_available(): ...@@ -466,6 +466,7 @@ def _is_gui_available():
try: try:
from tkinter import Tk from tkinter import Tk
root = Tk() root = Tk()
root.withdraw()
root.update() root.update()
root.destroy() root.destroy()
except Exception as e: except Exception as e:
...@@ -490,12 +491,12 @@ def is_resource_enabled(resource): ...@@ -490,12 +491,12 @@ def is_resource_enabled(resource):
def requires(resource, msg=None): def requires(resource, msg=None):
"""Raise ResourceDenied if the specified resource is not available.""" """Raise ResourceDenied if the specified resource is not available."""
if resource == 'gui' and not _is_gui_available():
raise ResourceDenied(_is_gui_available.reason)
if not is_resource_enabled(resource): if not is_resource_enabled(resource):
if msg is None: if msg is None:
msg = "Use of the %r resource not enabled" % resource msg = "Use of the %r resource not enabled" % resource
raise ResourceDenied(msg) raise ResourceDenied(msg)
if resource == 'gui' and not _is_gui_available():
raise ResourceDenied(_is_gui_available.reason)
def _requires_unix_version(sysname, min_version): def _requires_unix_version(sysname, min_version):
"""Decorator raising SkipTest if the OS is `sysname` and the version is less """Decorator raising SkipTest if the OS is `sysname` and the version is less
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment