Skip to content

Commit d89c884

Browse files
authored
Merge pull request #5657 from helloocc/master
Doc fix: delete useless.
2 parents bd34bd8 + 1d8f668 commit d89c884

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ Wil Cooley
258258
William Lee
259259
Wim Glenn
260260
Wouter van Ackooy
261+
Xixi Zhao
261262
Xuan Luong
262263
Xuecong Liao
263264
Zac Hatfield-Dodds

doc/en/fixture.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ The fixtures requested by ``test_foo`` will be instantiated in the following ord
307307

308308
1. ``s1``: is the highest-scoped fixture (``session``).
309309
2. ``m1``: is the second highest-scoped fixture (``module``).
310-
because it is a dependency of ``f1``.
311310
3. ``a1``: is a ``function``-scoped ``autouse`` fixture: it will be instantiated before other fixtures
312311
within the same scope.
313312
4. ``f3``: is a ``function``-scoped fixture, required by ``f1``: it needs to be instantiated at this point
@@ -541,7 +540,7 @@ of a fixture is needed multiple times in a single test. Instead of returning
541540
data directly, the fixture instead returns a function which generates the data.
542541
This function can then be called multiple times in the test.
543542

544-
Factories can have have parameters as needed::
543+
Factories can have parameters as needed::
545544

546545
@pytest.fixture
547546
def make_customer_record():

doc/en/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Features
6161

6262
- Can run :ref:`unittest <unittest>` (including trial) and :ref:`nose <noseintegration>` test suites out of the box;
6363

64-
- Python Python 3.5+ and PyPy 3;
64+
- Python 3.5+ and PyPy 3;
6565

6666
- Rich plugin architecture, with over 315+ `external plugins <http://plugincompat.herokuapp.com>`_ and thriving community;
6767

0 commit comments

Comments
 (0)