Skip to content

Commit 7082320

Browse files
committed
Apply modifications requested in review
1 parent 6fe7069 commit 7082320

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

doc/en/example/markers.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,15 @@ Or to select "http" and "quick" tests::
174174
.. note::
175175

176176
If you are using expressions such as ``"X and Y"`` then both ``X`` and ``Y``
177-
need to be simple non-keyword names. For example, ``"pass"`` or ``"from"``
178-
will result in SyntaxErrors because ``"-k"`` evaluates the expression using Python's ``eval`` function.
177+
need to be simple non-keyword names. For example, ``"pass"`` or ``"from"``
178+
will result in SyntaxErrors because ``"-k"`` evaluates the expression using
179+
Python's `eval`_ function.
180+
181+
.. _`eval`: https://docs.python.org/3.6/library/functions.html#eval
182+
179183

180184
However, if the ``"-k"`` argument is a simple string, no such restrictions
181-
apply. Also ``"-k 'not STRING'"`` has no restrictions. You can also
185+
apply. Also ``"-k 'not STRING'"`` has no restrictions. You can also
182186
specify numbers like ``"-k 1.3"`` to match tests which are parametrized
183187
with the float ``"1.3"``.
184188

doc/en/unittest.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,5 +198,5 @@ was executed ahead of the ``test_method``.
198198
The above ``usefixtures`` and ``autouse`` examples should help to mix in
199199
pytest fixtures into unittest suites.
200200

201-
You can also consider incrementally leave away ``unittest.TestCase`` subclassing,
202-
using plain asserts and get the full pytest feature set.
201+
You can also gradually move away from subclassing from ``unittest.TestCase``
202+
to *plain asserts* and the benefits from the full pytest feature set.

0 commit comments

Comments
 (0)