Skip to content

Commit e44a2ef

Browse files
nicoddemusblueyed
andcommitted
Apply suggestions from code review
Co-Authored-By: Daniel Hahler <[email protected]>
1 parent c6e3ff3 commit e44a2ef

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

doc/en/example/markers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Working with custom markers
55
=================================================
66

7-
Here are some example using the :ref:`mark` mechanism.
7+
Here are some examples using the :ref:`mark` mechanism.
88

99
.. _`mark run`:
1010

doc/en/historical-notes.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@ This state of things made it technically next to impossible to use data from mar
1919
Depending on how a marker got declared/changed one would get either a ``MarkerInfo`` which might contain markers from sibling classes,
2020
``MarkDecorators`` when marks came from parameterization or from a ``node.add_marker`` call, discarding prior marks. Also ``MarkerInfo`` acts like a single mark, when it in fact represents a merged view on multiple marks with the same name.
2121

22-
On top of that markers were not accessible the same way for modules, classes, and functions/methods.
22+
On top of that markers were not accessible in the same way for modules, classes, and functions/methods.
2323
In fact, markers were only accessible in functions, even if they were declared on classes/modules.
2424

25-
A new API to access markers has been introduced in pytest 3.6 in order to solve the problems with the initial design, providing :func:`_pytest.nodes.Node.iter_markers` method to iterate over markers in a consistent manner and reworking the internals, which solved great deal of problems with the initial design.
25+
A new API to access markers has been introduced in pytest 3.6 in order to solve the problems with
26+
the initial design, providing the :func:`_pytest.nodes.Node.iter_markers` method to iterate over
27+
markers in a consistent manner and reworking the internals, which solved a great deal of problems
28+
with the initial design.
2629

2730

2831
.. _update marker code:

0 commit comments

Comments
 (0)