Merge with 3.5
This commit is contained in:
commit
4847f3194d
|
@ -466,6 +466,7 @@ def _is_gui_available():
|
|||
try:
|
||||
from tkinter import Tk
|
||||
root = Tk()
|
||||
root.withdraw()
|
||||
root.update()
|
||||
root.destroy()
|
||||
except Exception as e:
|
||||
|
@ -490,12 +491,12 @@ def is_resource_enabled(resource):
|
|||
|
||||
def requires(resource, msg=None):
|
||||
"""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 msg is None:
|
||||
msg = "Use of the %r resource not enabled" % resource
|
||||
raise ResourceDenied(msg)
|
||||
if resource == 'gui' and not _is_gui_available():
|
||||
raise ResourceDenied(_is_gui_available.reason)
|
||||
|
||||
def _requires_unix_version(sysname, min_version):
|
||||
"""Decorator raising SkipTest if the OS is `sysname` and the version is less
|
||||
|
|
Loading…
Reference in New Issue