Skip to content

Commit f4bef42

Browse files
Merge remote-tracking branch 'upstream/Improvement-move-add-pseudo-funcarg-to-metafunc-parametrize' into Improvement-move-add-pseudo-funcarg-to-metafunc-parametrize
2 parents 8c2a6c7 + 67c6f0e commit f4bef42

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

src/_pytest/fixtures.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import functools
33
import inspect
44
import os
5-
import sys
65
import warnings
76
from collections import defaultdict
87
from collections import deque
@@ -16,7 +15,6 @@
1615
from typing import final
1716
from typing import Generator
1817
from typing import Generic
19-
from typing import Hashable
2018
from typing import Iterable
2119
from typing import Iterator
2220
from typing import List

src/_pytest/python.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ def _genfunctions(self, name: str, funcobj) -> Iterator["Function"]:
503503
if not metafunc._calls:
504504
yield Function.from_parent(self, name=name, fixtureinfo=fixtureinfo)
505505
else:
506-
507506
# Dynamic direct parametrization may have shadowed some fixtures,
508507
# so make sure we update what the function really needs.
509508
fixtureinfo.prune_dependency_tree()
@@ -1421,7 +1420,7 @@ def parametrize(
14211420
unittest=False,
14221421
ids=None,
14231422
is_pseudo=True,
1424-
_ispytest=True
1423+
_ispytest=True,
14251424
)
14261425
if name2pseudofixturedef is not None:
14271426
name2pseudofixturedef[argname] = fixturedef

testing/python/fixtures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4540,4 +4540,4 @@ def test(fixture1, fixture2):
45404540
r" <Function test\[a-2\]>",
45414541
r" <Function test\[b-1\]>",
45424542
]
4543-
)
4543+
)

0 commit comments

Comments
 (0)