From 643e5a9c445a8104e0eff4d3b0bef025bd342912 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Tue, 26 Jun 2018 21:56:00 +0200 Subject: [PATCH] fix docs --- changelog/3605.bugfix.rst | 2 +- src/_pytest/mark/structures.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog/3605.bugfix.rst b/changelog/3605.bugfix.rst index 2d8513332..58a294ecb 100644 --- a/changelog/3605.bugfix.rst +++ b/changelog/3605.bugfix.rst @@ -1 +1 @@ -unpack marks from parameterization to prevent the markdecorator missmatch bug. +no longer ValueError when using the ``get_marker`` api. diff --git a/src/_pytest/mark/structures.py b/src/_pytest/mark/structures.py index a04918f9d..d416e422b 100644 --- a/src/_pytest/mark/structures.py +++ b/src/_pytest/mark/structures.py @@ -231,6 +231,12 @@ def get_unpacked_marks(obj): def normalize_mark_list(mark_list): + """ + normalizes marker decorating helpers to mark objects + + :type mark_list: List[Union[Mark, Markdecorator]] + :rtype: List[Mark] + """ return [getattr(mark, "mark", mark) for mark in mark_list] # unpack MarkDecorator