Use mark_module() to mark a module

mark() had two different meanings depending on whether the globals
argument was passed.  It is now only a decorator of a test method or
class, and mark_module() marks a whole module, by default the caller's.

The label and its value are positional-only: a keyword would be
mistaken for the name of the label.

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: serhiy-storchaka

Doc/library/test.rst

@@ -531,12 +531,10 @@ The :mod:`!test.support` module defines the following functions:
    rather than looking directly in the path directories.
 
 
-.. function:: mark(label, value=True, *, globals=None)
+.. function:: mark(label, value=True, /)
 
-   Add a label to tests.
-   The ``@mark('label')`` decorator adds a label to method or class.
-   ``test.support.mark('label', globals=globals())`` adds a label to the whole
-   module.
+   Add a label to a test.  Use ``@mark('label')`` as a decorator of a test
+   method or class.
 
    The optional *value* (``True`` by default) is matched on the command line
    by ``--label label=value``, whereas ``--label label`` matches any value.
@@ -546,6 +544,16 @@ The :mod:`!test.support` module defines the following functions:
    automatically.
 
 
+.. function:: mark_module(label, value=True, /, *, globals=None)
+
+   Add a label to every test of a module.  Call it at the module level::
+
+      test.support.mark_module('pickletest')
+
+   The module is the caller, unless its :func:`globals` dict is passed as the
+   *globals* argument.
+
+
 .. function:: get_pagesize()
 
    Get size of a page in bytes.

Lib/test/support/__init__.py

@@ -340,7 +340,7 @@ def requires(resource, msg=None):
     """Raise ResourceDenied if the specified resource is not available."""
     f = sys._getframe(1)
     if f.f_globals is f.f_locals:
-        mark(f'requires_{resource}', globals=f.f_globals)
+        mark_module(f'requires_{resource}', globals=f.f_globals)
     if not is_resource_enabled(resource):
         if msg is None:
             msg = "Use of the %r resource not enabled" % resource
@@ -682,7 +682,7 @@ def requires_working_socket(*, module=False, globals=None):
     if module or globals is not None:
         if globals is None:
             globals = sys._getframe(1).f_globals
-        mark(label, globals=globals)
+        mark_module(label, globals=globals)
         if not has_socket_support:
             raise unittest.SkipTest(msg)
     else:
@@ -1374,24 +1374,27 @@ def wrapper(self):
 #=======================================================================
 # unittest integration.
 
-def mark(label, value=True, *, globals=None):
-    """Add a label to test.
-
-    To add a label to method or class, use it as a decorator.
-
-    To add a label to module, pass the globals() dict as the globals argument.
+def mark(label, value=True, /):
+    """Add a label to a test method or class.  Use it as a decorator.
 
     The optional value (``True`` by default) can be matched on the command
     line with ``--label name=value``.
     """
-    if globals is not None:
-        globals[f'_label_{label}'] = value
-        return
     def decorator(test):
         setattr(test, f'_label_{label}', value)
         return test
     return decorator
 
+def mark_module(label, value=True, /, *, globals=None):
+    """Add a label to every test of a module.
+
+    The module is the caller, unless its globals() dict is passed as the
+    globals argument.
+    """
+    if globals is None:
+        globals = sys._getframe(1).f_globals
+    globals[f'_label_{label}'] = value
+
 def combine(*decorators):
     def decorator(test):
         for deco in reversed(decorators):

Lib/test/support/import_helper.py

@@ -90,8 +90,8 @@ def import_module(name, deprecated=False, *, required_on=()):
     with _ignore_deprecated_imports(deprecated):
         f = sys._getframe(1)
         if f.f_globals is f.f_locals:
-            from test.support import mark
-            mark(f'requires_{name}', globals=f.f_globals)
+            from test.support import mark_module
+            mark_module(f'requires_{name}', globals=f.f_globals)
         try:
             return importlib.import_module(name)
         except ImportError as msg:

Lib/test/support/threading_helper.py

@@ -247,7 +247,7 @@ def requires_working_threading(*, module=False, globals=None):
     if module or globals is not None:
         if globals is None:
             globals = sys._getframe(1).f_globals
-        support.mark(label, globals=globals)
+        support.mark_module(label, globals=globals)
         if not can_start_thread:
             raise unittest.SkipTest(msg)
     else: