diff options
Diffstat (limited to 'Lib/test/support')
| -rw-r--r-- | Lib/test/support/__init__.py | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 40aab96..c1a187d 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -454,23 +454,17 @@ def _is_gui_available(): return _is_gui_available.result def is_resource_enabled(resource): - """Test whether a resource is enabled. Known resources are set by - regrtest.py.""" - return use_resources is not None and resource in use_resources + """Test whether a resource is enabled. -def requires(resource, msg=None): - """Raise ResourceDenied if the specified resource is not available. - - If the caller's module is __main__ then automatically return True. The - possibility of False being returned occurs when regrtest.py is - executing. + Known resources are set by regrtest.py. If not running under regrtest.py, + all resources are assumed enabled unless use_resources has been set. """ + return use_resources is None or resource in use_resources + +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) - # see if the caller's module is __main__ - if so, treat as if - # the resource was set - if sys._getframe(1).f_globals.get("__name__") == "__main__": - return if not is_resource_enabled(resource): if msg is None: msg = "Use of the %r resource not enabled" % resource |