Skip to content

Commit

Permalink
Merge pull request pytest-dev#7566 from bluetech/pylint-callable-2-6.0.x
Browse files Browse the repository at this point in the history
[6.0.x] mark: fix pylint not-callable error on pytest.mark.parametrize(...), again
  • Loading branch information
bluetech committed Jul 29, 2020
2 parents 5d606e9 + bec1bda commit d46fe88
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 2 additions & 0 deletions changelog/7558.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix pylint ``not-callable`` lint on ``pytest.mark.parametrize()`` and the other builtin marks:
``skip``, ``skipif``, ``xfail``, ``usefixtures``, ``filterwarnings``.
14 changes: 6 additions & 8 deletions src/_pytest/mark/structures.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import warnings
from typing import Any
from typing import Callable
from typing import cast
from typing import Iterable
from typing import List
from typing import Mapping
Expand Down Expand Up @@ -473,14 +472,13 @@ def test_function():

# See TYPE_CHECKING above.
if TYPE_CHECKING:
# Using casts instead of type comments intentionally - issue #7473.
# TODO(py36): Change to builtin annotation syntax.
skip = cast(_SkipMarkDecorator, None)
skipif = cast(_SkipifMarkDecorator, None)
xfail = cast(_XfailMarkDecorator, None)
parametrize = cast(_ParametrizeMarkDecorator, None)
usefixtures = cast(_UsefixturesMarkDecorator, None)
filterwarnings = cast(_FilterwarningsMarkDecorator, None)
skip = _SkipMarkDecorator(Mark("skip", (), {}))
skipif = _SkipifMarkDecorator(Mark("skipif", (), {}))
xfail = _XfailMarkDecorator(Mark("xfail", (), {}))
parametrize = _ParametrizeMarkDecorator(Mark("parametrize", (), {}))
usefixtures = _UsefixturesMarkDecorator(Mark("usefixtures", (), {}))
filterwarnings = _FilterwarningsMarkDecorator(Mark("filterwarnings", (), {}))

def __getattr__(self, name: str) -> MarkDecorator:
if name[0] == "_":
Expand Down

0 comments on commit d46fe88

Please sign in to comment.