p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py36+: remove _pytest.compat.overload

This commit is contained in:
Anthony Sottile 2020-10-02 13:07:37 -07:00
parent 6ed07a1c25
commit 7f0d2beb50
12 changed files with 61 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/_pytest/_code/code.py
View File

@ -17,6 +17,7 @@ from typing import Iterable
from typing import List from typing import List
from typing import Mapping from typing import Mapping
from typing import Optional from typing import Optional
from typing import overload
from typing import Pattern from typing import Pattern
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
@ -41,7 +42,6 @@ from _pytest._io.saferepr import safeformat
from _pytest._io.saferepr import saferepr from _pytest._io.saferepr import saferepr
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import get_real_func from _pytest.compat import get_real_func
from _pytest.compat import overload
from _pytest.pathlib import Path from _pytest.pathlib import Path
if TYPE_CHECKING: if TYPE_CHECKING:
@ -346,13 +346,11 @@ class Traceback(List[TracebackEntry]):
def __getitem__(self, key: int) -> TracebackEntry: def __getitem__(self, key: int) -> TracebackEntry:
... ...
@overload # noqa: F811 @overload
def __getitem__(self, key: slice) -> "Traceback": # noqa: F811 def __getitem__(self, key: slice) -> "Traceback":
... ...
def __getitem__( # noqa: F811 def __getitem__(self, key: Union[int, slice]) -> Union[TracebackEntry, "Traceback"]:
self, key: Union[int, slice]
) -> Union[TracebackEntry, "Traceback"]:
if isinstance(key, slice): if isinstance(key, slice):
return self.__class__(super().__getitem__(key)) return self.__class__(super().__getitem__(key))
else: else:

9
src/_pytest/_code/source.py
View File

@ -8,11 +8,10 @@ from typing import Iterable
from typing import Iterator from typing import Iterator
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import overload
from typing import Tuple from typing import Tuple
from typing import Union from typing import Union
from _pytest.compat import overload
class Source: class Source:
"""An immutable object holding a source code fragment. """An immutable object holding a source code fragment.
@ -46,11 +45,11 @@ class Source:
def __getitem__(self, key: int) -> str: def __getitem__(self, key: int) -> str:
... ...
@overload # noqa: F811 @overload
def __getitem__(self, key: slice) -> "Source": # noqa: F811 def __getitem__(self, key: slice) -> "Source":
... ...
def __getitem__(self, key: Union[int, slice]) -> Union[str, "Source"]: # noqa: F811 def __getitem__(self, key: Union[int, slice]) -> Union[str, "Source"]:
if isinstance(key, int): if isinstance(key, int):
return self.lines[key] return self.lines[key]
else: else:

2
src/_pytest/assertion/rewrite.py
View File

@ -41,7 +41,7 @@ from _pytest.pathlib import PurePath
from _pytest.store import StoreKey from _pytest.store import StoreKey
if TYPE_CHECKING: if TYPE_CHECKING:
from _pytest.assertion import AssertionState # noqa: F401 from _pytest.assertion import AssertionState
assertstate_key = StoreKey["AssertionState"]() assertstate_key = StoreKey["AssertionState"]()

18
src/_pytest/compat.py
View File

@ -11,7 +11,6 @@ from typing import Any
from typing import Callable from typing import Callable
from typing import Generic from typing import Generic
from typing import Optional from typing import Optional
from typing import overload as overload
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
@ -326,12 +325,6 @@ def safe_isclass(obj: object) -> bool:
return False return False
if sys.version_info < (3, 5, 2):
def overload(f): # noqa: F811
return f
if TYPE_CHECKING: if TYPE_CHECKING:
if sys.version_info >= (3, 8): if sys.version_info >= (3, 8):
from typing import final as final from typing import final as final
@ -341,13 +334,14 @@ elif sys.version_info >= (3, 8):
from typing import final as final from typing import final as final
else: else:
def final(f): # noqa: F811 def final(f):
return f return f
if sys.version_info >= (3, 8): if sys.version_info >= (3, 8):
from functools import cached_property as cached_property from functools import cached_property as cached_property
else: else:
from typing import overload
from typing import Type from typing import Type
class cached_property(Generic[_S, _T]): class cached_property(Generic[_S, _T]):
@ -363,13 +357,11 @@ else:
) -> "cached_property[_S, _T]": ) -> "cached_property[_S, _T]":
... ...
@overload # noqa: F811 @overload
def __get__( # noqa: F811 def __get__(self, instance: _S, owner: Optional[Type[_S]] = ...) -> _T:
self, instance: _S, owner: Optional[Type[_S]] = ...
) -> _T:
... ...
def __get__(self, instance, owner=None): # noqa: F811 def __get__(self, instance, owner=None):
if instance is None: if instance is None:
return self return self
value = instance.__dict__[self.func.__name__] = self.func(instance) value = instance.__dict__[self.func.__name__] = self.func(instance)

10
src/_pytest/fixtures.py
View File

@ -16,6 +16,7 @@ from typing import Iterable
from typing import Iterator from typing import Iterator
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import overload
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
@ -43,7 +44,6 @@ from _pytest.compat import getlocation
from _pytest.compat import is_generator from _pytest.compat import is_generator
from _pytest.compat import NOTSET from _pytest.compat import NOTSET
from _pytest.compat import order_preserving_dict from _pytest.compat import order_preserving_dict
from _pytest.compat import overload
from _pytest.compat import safe_getattr from _pytest.compat import safe_getattr
from _pytest.config import _PluggyPlugin from _pytest.config import _PluggyPlugin
from _pytest.config import Config from _pytest.config import Config
@ -462,7 +462,7 @@ class FixtureRequest:
@property @property
def config(self) -> Config: def config(self) -> Config:
"""The pytest config object associated with this request.""" """The pytest config object associated with this request."""
return self._pyfuncitem.config # type: ignore[no-any-return] # noqa: F723 return self._pyfuncitem.config # type: ignore[no-any-return]
@property @property
def function(self): def function(self):
@ -1225,8 +1225,8 @@ def fixture(
... ...
@overload # noqa: F811 @overload
def fixture( # noqa: F811 def fixture(
fixture_function: None = ..., fixture_function: None = ...,
*, *,
scope: "Union[_Scope, Callable[[str, Config], _Scope]]" = ..., scope: "Union[_Scope, Callable[[str, Config], _Scope]]" = ...,
@ -1243,7 +1243,7 @@ def fixture( # noqa: F811
... ...
def fixture( # noqa: F811 def fixture(
fixture_function: Optional[_FixtureFunction] = None, fixture_function: Optional[_FixtureFunction] = None,
*, *,
scope: "Union[_Scope, Callable[[str, Config], _Scope]]" = "function", scope: "Union[_Scope, Callable[[str, Config], _Scope]]" = "function",

8
src/_pytest/main.py
View File

@ -11,6 +11,7 @@ from typing import FrozenSet
from typing import Iterator from typing import Iterator
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import overload
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
@ -24,7 +25,6 @@ import py
import _pytest._code import _pytest._code
from _pytest import nodes from _pytest import nodes
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import overload
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import directory_arg from _pytest.config import directory_arg
from _pytest.config import ExitCode from _pytest.config import ExitCode
@ -562,13 +562,13 @@ class Session(nodes.FSCollector):
) -> Sequence[nodes.Item]: ) -> Sequence[nodes.Item]:
... ...
@overload # noqa: F811 @overload
def perform_collect( # noqa: F811 def perform_collect(
self, args: Optional[Sequence[str]] = ..., genitems: bool = ... self, args: Optional[Sequence[str]] = ..., genitems: bool = ...
) -> Sequence[Union[nodes.Item, nodes.Collector]]: ) -> Sequence[Union[nodes.Item, nodes.Collector]]:
... ...
def perform_collect( # noqa: F811 def perform_collect(
self, args: Optional[Sequence[str]] = None, genitems: bool = True self, args: Optional[Sequence[str]] = None, genitems: bool = True
) -> Sequence[Union[nodes.Item, nodes.Collector]]: ) -> Sequence[Union[nodes.Item, nodes.Collector]]:
"""Perform the collection phase for this session. """Perform the collection phase for this session.

18
src/_pytest/mark/structures.py
View File

@ -11,6 +11,7 @@ from typing import Mapping
from typing import MutableMapping from typing import MutableMapping
from typing import NamedTuple from typing import NamedTuple
from typing import Optional from typing import Optional
from typing import overload
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
@ -26,7 +27,6 @@ from ..compat import ascii_escaped
from ..compat import final from ..compat import final
from ..compat import NOTSET from ..compat import NOTSET
from ..compat import NotSetType from ..compat import NotSetType
from ..compat import overload
from _pytest.config import Config from _pytest.config import Config
from _pytest.outcomes import fail from _pytest.outcomes import fail
from _pytest.warning_types import PytestUnknownMarkWarning from _pytest.warning_types import PytestUnknownMarkWarning
@ -330,13 +330,11 @@ class MarkDecorator:
def __call__(self, arg: _Markable) -> _Markable: # type: ignore[misc] def __call__(self, arg: _Markable) -> _Markable: # type: ignore[misc]
pass pass
@overload # noqa: F811 @overload
def __call__( # noqa: F811 def __call__(self, *args: object, **kwargs: object) -> "MarkDecorator":
self, *args: object, **kwargs: object
) -> "MarkDecorator":
pass pass
def __call__(self, *args: object, **kwargs: object): # noqa: F811 def __call__(self, *args: object, **kwargs: object):
"""Call the MarkDecorator.""" """Call the MarkDecorator."""
if args and not kwargs: if args and not kwargs:
func = args[0] func = args[0]
@ -391,8 +389,8 @@ if TYPE_CHECKING:
def __call__(self, arg: _Markable) -> _Markable: def __call__(self, arg: _Markable) -> _Markable:
... ...
@overload # noqa: F811 @overload
def __call__(self, reason: str = ...) -> "MarkDecorator": # noqa: F811 def __call__(self, reason: str = ...) -> "MarkDecorator":
... ...
class _SkipifMarkDecorator(MarkDecorator): class _SkipifMarkDecorator(MarkDecorator):
@ -409,8 +407,8 @@ if TYPE_CHECKING:
def __call__(self, arg: _Markable) -> _Markable: def __call__(self, arg: _Markable) -> _Markable:
... ...
@overload # noqa: F811 @overload
def __call__( # noqa: F811 def __call__(
self, self,
condition: Union[str, bool] = ..., condition: Union[str, bool] = ...,
*conditions: Union[str, bool], *conditions: Union[str, bool],

8
src/_pytest/monkeypatch.py
View File

@ -9,13 +9,13 @@ from typing import Generator
from typing import List from typing import List
from typing import MutableMapping from typing import MutableMapping
from typing import Optional from typing import Optional
from typing import overload
from typing import Tuple from typing import Tuple
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
import pytest import pytest
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import overload
from _pytest.fixtures import fixture from _pytest.fixtures import fixture
from _pytest.pathlib import Path from _pytest.pathlib import Path
@ -156,13 +156,13 @@ class MonkeyPatch:
) -> None: ) -> None:
... ...
@overload # noqa: F811 @overload
def setattr( # noqa: F811 def setattr(
self, target: object, name: str, value: object, raising: bool = ..., self, target: object, name: str, value: object, raising: bool = ...,
) -> None: ) -> None:
... ...
def setattr( # noqa: F811 def setattr(
self, self,
target: Union[str, object], target: Union[str, object],
name: Union[object, str], name: Union[object, str],

8
src/_pytest/nodes.py
View File

@ -8,6 +8,7 @@ from typing import Iterable
from typing import Iterator from typing import Iterator
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import overload
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
from typing import Type from typing import Type
@ -22,7 +23,6 @@ from _pytest._code import getfslineno
from _pytest._code.code import ExceptionInfo from _pytest._code.code import ExceptionInfo
from _pytest._code.code import TerminalRepr from _pytest._code.code import TerminalRepr
from _pytest.compat import cached_property from _pytest.compat import cached_property
from _pytest.compat import overload
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import ConftestImportFailure from _pytest.config import ConftestImportFailure
from _pytest.deprecated import FSCOLLECTOR_GETHOOKPROXY_ISINITPATH from _pytest.deprecated import FSCOLLECTOR_GETHOOKPROXY_ISINITPATH
@ -316,11 +316,11 @@ class Node(metaclass=NodeMeta):
def get_closest_marker(self, name: str) -> Optional[Mark]: def get_closest_marker(self, name: str) -> Optional[Mark]:
... ...
@overload # noqa: F811 @overload
def get_closest_marker(self, name: str, default: Mark) -> Mark: # noqa: F811 def get_closest_marker(self, name: str, default: Mark) -> Mark:
... ...
def get_closest_marker( # noqa: F811 def get_closest_marker(
self, name: str, default: Optional[Mark] = None self, name: str, default: Optional[Mark] = None
) -> Optional[Mark]: ) -> Optional[Mark]:
"""Return the first marker matching the name, from closest (for """Return the first marker matching the name, from closest (for

22
src/_pytest/pytester.py
View File

@ -16,6 +16,7 @@ from typing import Generator
from typing import Iterable from typing import Iterable
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import overload
from typing import Sequence from typing import Sequence
from typing import Tuple from typing import Tuple
from typing import Type from typing import Type
@ -31,7 +32,6 @@ from _pytest import timing
from _pytest._code import Source from _pytest._code import Source
from _pytest.capture import _get_multicapture from _pytest.capture import _get_multicapture
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import overload
from _pytest.config import _PluggyPlugin from _pytest.config import _PluggyPlugin
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import ExitCode from _pytest.config import ExitCode
@ -277,14 +277,14 @@ class HookRecorder:
) -> Sequence[CollectReport]: ) -> Sequence[CollectReport]:
... ...
@overload # noqa: F811 @overload
def getreports( # noqa: F811 def getreports(
self, names: "Literal['pytest_runtest_logreport']", self, names: "Literal['pytest_runtest_logreport']",
) -> Sequence[TestReport]: ) -> Sequence[TestReport]:
... ...
@overload # noqa: F811 @overload
def getreports( # noqa: F811 def getreports(
self, self,
names: Union[str, Iterable[str]] = ( names: Union[str, Iterable[str]] = (
"pytest_collectreport", "pytest_collectreport",
@ -293,7 +293,7 @@ class HookRecorder:
) -> Sequence[Union[CollectReport, TestReport]]: ) -> Sequence[Union[CollectReport, TestReport]]:
... ...
def getreports( # noqa: F811 def getreports(
self, self,
names: Union[str, Iterable[str]] = ( names: Union[str, Iterable[str]] = (
"pytest_collectreport", "pytest_collectreport",
@ -340,14 +340,14 @@ class HookRecorder:
) -> Sequence[CollectReport]: ) -> Sequence[CollectReport]:
... ...
@overload # noqa: F811 @overload
def getfailures( # noqa: F811 def getfailures(
self, names: "Literal['pytest_runtest_logreport']", self, names: "Literal['pytest_runtest_logreport']",
) -> Sequence[TestReport]: ) -> Sequence[TestReport]:
... ...
@overload # noqa: F811 @overload
def getfailures( # noqa: F811 def getfailures(
self, self,
names: Union[str, Iterable[str]] = ( names: Union[str, Iterable[str]] = (
"pytest_collectreport", "pytest_collectreport",
@ -356,7 +356,7 @@ class HookRecorder:
) -> Sequence[Union[CollectReport, TestReport]]: ) -> Sequence[Union[CollectReport, TestReport]]:
... ...
def getfailures( # noqa: F811 def getfailures(
self, self,
names: Union[str, Iterable[str]] = ( names: Union[str, Iterable[str]] = (
"pytest_collectreport", "pytest_collectreport",

8
src/_pytest/python_api.py
View File

@ -11,6 +11,7 @@ from typing import Callable
from typing import cast from typing import cast
from typing import Generic from typing import Generic
from typing import Optional from typing import Optional
from typing import overload
from typing import Pattern from typing import Pattern
from typing import Tuple from typing import Tuple
from typing import Type from typing import Type
@ -19,7 +20,6 @@ from typing import Union
import _pytest._code import _pytest._code
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import overload
from _pytest.compat import STRING_TYPES from _pytest.compat import STRING_TYPES
from _pytest.outcomes import fail from _pytest.outcomes import fail
@ -564,8 +564,8 @@ def raises(
... ...
@overload # noqa: F811 @overload
def raises( # noqa: F811 def raises(
expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], expected_exception: Union[Type[_E], Tuple[Type[_E], ...]],
func: Callable[..., Any], func: Callable[..., Any],
*args: Any, *args: Any,
@ -574,7 +574,7 @@ def raises( # noqa: F811
... ...
def raises( # noqa: F811 def raises(
expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], *args: Any, **kwargs: Any expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], *args: Any, **kwargs: Any
) -> Union["RaisesContext[_E]", _pytest._code.ExceptionInfo[_E]]: ) -> Union["RaisesContext[_E]", _pytest._code.ExceptionInfo[_E]]:
r"""Assert that a code block/function call raises ``expected_exception`` r"""Assert that a code block/function call raises ``expected_exception``

16
src/_pytest/recwarn.py
View File

@ -8,6 +8,7 @@ from typing import Generator
from typing import Iterator from typing import Iterator
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import overload
from typing import Pattern from typing import Pattern
from typing import Tuple from typing import Tuple
from typing import Type from typing import Type
@ -15,7 +16,6 @@ from typing import TypeVar
from typing import Union from typing import Union
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import overload
from _pytest.fixtures import fixture from _pytest.fixtures import fixture
from _pytest.outcomes import fail from _pytest.outcomes import fail
@ -43,14 +43,12 @@ def deprecated_call(
... ...
@overload # noqa: F811 @overload
def deprecated_call( # noqa: F811 def deprecated_call(func: Callable[..., T], *args: Any, **kwargs: Any) -> T:
func: Callable[..., T], *args: Any, **kwargs: Any
) -> T:
... ...
def deprecated_call( # noqa: F811 def deprecated_call(
func: Optional[Callable[..., Any]] = None, *args: Any, **kwargs: Any func: Optional[Callable[..., Any]] = None, *args: Any, **kwargs: Any
) -> Union["WarningsRecorder", Any]: ) -> Union["WarningsRecorder", Any]:
"""Assert that code produces a ``DeprecationWarning`` or ``PendingDeprecationWarning``. """Assert that code produces a ``DeprecationWarning`` or ``PendingDeprecationWarning``.
@ -90,8 +88,8 @@ def warns(
... ...
@overload # noqa: F811 @overload
def warns( # noqa: F811 def warns(
expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]], expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]],
func: Callable[..., T], func: Callable[..., T],
*args: Any, *args: Any,
@ -100,7 +98,7 @@ def warns( # noqa: F811
... ...
def warns( # noqa: F811 def warns(
expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]], expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]],
*args: Any, *args: Any,
match: Optional[Union[str, Pattern[str]]] = None, match: Optional[Union[str, Pattern[str]]] = None,