summaryrefslogtreecommitdiff
path: root/tests/test_ext_apidoc.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_ext_apidoc.py')
-rw-r--r--tests/test_ext_apidoc.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/test_ext_apidoc.py b/tests/test_ext_apidoc.py
index ee21f8ffd..2d427417b 100644
--- a/tests/test_ext_apidoc.py
+++ b/tests/test_ext_apidoc.py
@@ -22,18 +22,13 @@ def apidoc(rootdir, tempdir, apidoc_params):
@pytest.fixture
def apidoc_params(request):
- if hasattr(request.node, 'iter_markers'): # pytest-3.6.0 or newer
- markers = request.node.iter_markers("apidoc")
- else:
- markers = request.node.get_marker("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