Move `@overload` to compat

This commit is contained in:
Anthony Sottile 2019-08-18 14:54:52 -07:00
parent 1e3205e7cf
commit a7ede64f42
4 changed files with 10 additions and 15 deletions

View File

@ -26,7 +26,7 @@ repos:
hooks: hooks:
- id: flake8 - id: flake8
language_version: python3 language_version: python3
additional_dependencies: [flake8-typing-imports] additional_dependencies: [flake8-typing-imports==1.3.0]
- repo: https://github.com/asottile/reorder_python_imports - repo: https://github.com/asottile/reorder_python_imports
rev: v1.4.0 rev: v1.4.0
hooks: hooks:

View File

@ -9,6 +9,7 @@ import sys
from contextlib import contextmanager from contextlib import contextmanager
from inspect import Parameter from inspect import Parameter
from inspect import signature from inspect import signature
from typing import overload
import attr import attr
import py import py
@ -347,3 +348,9 @@ class FuncargnamesCompatAttr:
warnings.warn(FUNCARGNAMES, stacklevel=2) warnings.warn(FUNCARGNAMES, stacklevel=2)
return self.fixturenames return self.fixturenames
if sys.version_info < (3, 5, 2):
def overload(f): # noqa: F811
return f

View File

@ -1,7 +1,6 @@
import inspect import inspect
import math import math
import pprint import pprint
import sys
from collections.abc import Iterable from collections.abc import Iterable
from collections.abc import Mapping from collections.abc import Mapping
from collections.abc import Sized from collections.abc import Sized
@ -14,7 +13,6 @@ 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 TypeVar from typing import TypeVar
@ -23,17 +21,13 @@ from typing import Union
from more_itertools.more import always_iterable from more_itertools.more import always_iterable
import _pytest._code import _pytest._code
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
if False: # TYPE_CHECKING if False: # TYPE_CHECKING
from typing import Type # noqa: F401 (used in type string) from typing import Type # noqa: F401 (used in type string)
if sys.version_info <= (3, 5, 1):
def overload(f): # noqa: F811
return f
BASE_TYPE = (type, STRING_TYPES) BASE_TYPE = (type, STRING_TYPES)

View File

@ -1,6 +1,5 @@
""" recording warnings during test function execution. """ """ recording warnings during test function execution. """
import re import re
import sys
import warnings import warnings
from types import TracebackType from types import TracebackType
from typing import Any from typing import Any
@ -8,22 +7,17 @@ from typing import Callable
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 Union from typing import Union
from _pytest.compat import overload
from _pytest.fixtures import yield_fixture from _pytest.fixtures import yield_fixture
from _pytest.outcomes import fail from _pytest.outcomes import fail
if False: # TYPE_CHECKING if False: # TYPE_CHECKING
from typing import Type from typing import Type
if sys.version_info <= (3, 5, 1):
def overload(f): # noqa: F811
return f
@yield_fixture @yield_fixture
def recwarn(): def recwarn():