From f95bcf51efe2ec1ebf6a251322b37a6caf4e2aac Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Date: Fri, 22 Apr 2022 07:29:53 +0100
Subject: [PATCH] Refactor

---
 sphinx/testing/fixtures.py | 12 +++++-------
 tests/test_ext_apidoc.py   | 10 ++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py
index 939021fe1..891f0f7cc 100644
--- a/sphinx/testing/fixtures.py
+++ b/sphinx/testing/fixtures.py
@@ -64,16 +64,14 @@ def app_params(request: Any, test_params: Dict, shared_result: SharedResult,
 
     # ##### process pytest.mark.sphinx
 
-    markers = request.node.iter_markers("sphinx")
     pargs = {}
     kwargs: Dict[str, Any] = {}
 
-    if markers is not None:
-        # to avoid stacking positional args
-        for info in reversed(list(markers)):
-            for i, a in enumerate(info.args):
-                pargs[i] = a
-            kwargs.update(info.kwargs)
+    # to avoid stacking positional args
+    for info in reversed(list(request.node.iter_markers("sphinx"))):
+        for i, a in enumerate(info.args):
+            pargs[i] = a
+        kwargs.update(info.kwargs)
 
     args = [pargs[i] for i in sorted(pargs.keys())]
 
diff --git a/tests/test_ext_apidoc.py b/tests/test_ext_apidoc.py
index 411b1259b..2d427417b 100644
--- a/tests/test_ext_apidoc.py
+++ b/tests/test_ext_apidoc.py
@@ -22,15 +22,13 @@ def apidoc(rootdir, tempdir, apidoc_params):
 
 @pytest.fixture
 def apidoc_params(request):
-    markers = request.node.iter_markers("apidoc")
     pargs = {}
     kwargs = {}
 
-    if markers is not None:
-        for info in reversed(list(markers)):
-            for i, a in enumerate(info.args):
-                pargs[i] = a
-            kwargs.update(info.kwargs)
+    for info in reversed(list(request.node.iter_markers("apidoc"))):
+        for i, a in enumerate(info.args):
+            pargs[i] = a
+        kwargs.update(info.kwargs)
 
     args = [pargs[i] for i in sorted(pargs.keys())]
     return args, kwargs