py36+: remove TYPE_CHECKING from _pytest.compat

automated with:

```bash
git grep -l 'from .* import TYPE_CHECKING' |
    xargs reorder-python-imports \
        --application-directories .:src \
        --remove-import 'from _pytest.compat import TYPE_CHECKING' \
        --add-import 'from typing import TYPE_CHECKING'
```
This commit is contained in:
Anthony Sottile 2020-10-02 12:09:56 -07:00
parent 325b988ca8
commit a238d1f37d
35 changed files with 35 additions and 41 deletions

View File

@ -17,9 +17,9 @@
# The short X.Y version. # The short X.Y version.
import os import os
import sys import sys
from typing import TYPE_CHECKING
from _pytest import __version__ as version from _pytest import __version__ as version
from _pytest.compat import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
import sphinx.application import sphinx.application

View File

@ -21,6 +21,7 @@ from typing import Pattern
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
from weakref import ref from weakref import ref
@ -40,7 +41,6 @@ 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.compat import overload
from _pytest.compat import TYPE_CHECKING
from _pytest.pathlib import Path from _pytest.pathlib import Path
if TYPE_CHECKING: if TYPE_CHECKING:

View File

@ -4,12 +4,12 @@ from typing import Any
from typing import Generator from typing import Generator
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import TYPE_CHECKING
from _pytest.assertion import rewrite from _pytest.assertion import rewrite
from _pytest.assertion import truncate from _pytest.assertion import truncate
from _pytest.assertion import util from _pytest.assertion import util
from _pytest.assertion.rewrite import assertstate_key from _pytest.assertion.rewrite import assertstate_key
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import hookimpl from _pytest.config import hookimpl
from _pytest.config.argparsing import Parser from _pytest.config.argparsing import Parser

View File

@ -22,6 +22,7 @@ from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import py import py
@ -33,7 +34,6 @@ from _pytest.assertion.util import ( # noqa: F401
format_explanation as _format_explanation, format_explanation as _format_explanation,
) )
from _pytest.compat import fspath from _pytest.compat import fspath
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.main import Session from _pytest.main import Session
from _pytest.pathlib import fnmatch_ex from _pytest.pathlib import fnmatch_ex

View File

@ -14,11 +14,11 @@ from typing import Iterator
from typing import Optional from typing import Optional
from typing import TextIO from typing import TextIO
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
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 TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.config.argparsing import Parser from _pytest.config.argparsing import Parser
from _pytest.fixtures import SubRequest from _pytest.fixtures import SubRequest

View File

@ -14,6 +14,7 @@ from typing import Generic
from typing import Optional from typing import Optional
from typing import overload as overload from typing import overload as overload
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
@ -22,12 +23,6 @@ import attr
from _pytest.outcomes import fail from _pytest.outcomes import fail
from _pytest.outcomes import TEST_OUTCOME from _pytest.outcomes import TEST_OUTCOME
if sys.version_info < (3, 5, 2):
TYPE_CHECKING = False # type: bool
else:
from typing import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import NoReturn from typing import NoReturn
from typing import Type from typing import Type

View File

@ -26,6 +26,7 @@ from typing import Sequence
from typing import Set from typing import Set
from typing import TextIO from typing import TextIO
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import attr import attr
@ -45,7 +46,6 @@ from _pytest._code import filter_traceback
from _pytest._io import TerminalWriter from _pytest._io import TerminalWriter
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import importlib_metadata from _pytest.compat import importlib_metadata
from _pytest.compat import TYPE_CHECKING
from _pytest.outcomes import fail from _pytest.outcomes import fail
from _pytest.outcomes import Skipped from _pytest.outcomes import Skipped
from _pytest.pathlib import bestrelpath from _pytest.pathlib import bestrelpath

View File

@ -11,13 +11,13 @@ from typing import Mapping
from typing import Optional from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import py import py
import _pytest._io import _pytest._io
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import TYPE_CHECKING
from _pytest.config.exceptions import UsageError from _pytest.config.exceptions import UsageError
if TYPE_CHECKING: if TYPE_CHECKING:

View File

@ -5,12 +5,12 @@ from typing import List
from typing import Optional from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import iniconfig import iniconfig
from .exceptions import UsageError from .exceptions import UsageError
from _pytest.compat import TYPE_CHECKING
from _pytest.outcomes import fail from _pytest.outcomes import fail
from _pytest.pathlib import absolutepath from _pytest.pathlib import absolutepath
from _pytest.pathlib import commonpath from _pytest.pathlib import commonpath

View File

@ -9,11 +9,11 @@ from typing import Generator
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
from _pytest import outcomes from _pytest import outcomes
from _pytest._code import ExceptionInfo from _pytest._code import ExceptionInfo
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import ConftestImportFailure from _pytest.config import ConftestImportFailure
from _pytest.config import hookimpl from _pytest.config import hookimpl

View File

@ -17,6 +17,7 @@ from typing import Optional
from typing import Pattern from typing import Pattern
from typing import Sequence from typing import Sequence
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import py.path import py.path
@ -28,7 +29,6 @@ from _pytest._code.code import ReprFileLocation
from _pytest._code.code import TerminalRepr from _pytest._code.code import TerminalRepr
from _pytest._io import TerminalWriter from _pytest._io import TerminalWriter
from _pytest.compat import safe_getattr from _pytest.compat import safe_getattr
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.config.argparsing import Parser from _pytest.config.argparsing import Parser
from _pytest.fixtures import FixtureRequest from _pytest.fixtures import FixtureRequest

View File

@ -19,6 +19,7 @@ from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
@ -43,7 +44,6 @@ 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 overload
from _pytest.compat import safe_getattr from _pytest.compat import safe_getattr
from _pytest.compat import TYPE_CHECKING
from _pytest.config import _PluggyPlugin from _pytest.config import _PluggyPlugin
from _pytest.config import Config from _pytest.config import Config
from _pytest.config.argparsing import Parser from _pytest.config.argparsing import Parser

View File

@ -7,12 +7,12 @@ from typing import Mapping
from typing import Optional from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import py.path import py.path
from pluggy import HookspecMarker from pluggy import HookspecMarker
from _pytest.compat import TYPE_CHECKING
from _pytest.deprecated import WARNING_CAPTURED_HOOK from _pytest.deprecated import WARNING_CAPTURED_HOOK
if TYPE_CHECKING: if TYPE_CHECKING:

View File

@ -14,6 +14,7 @@ from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import attr import attr
@ -23,7 +24,6 @@ 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.compat import overload
from _pytest.compat import TYPE_CHECKING
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

View File

@ -4,6 +4,7 @@ import warnings
from typing import AbstractSet from typing import AbstractSet
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import attr import attr
@ -17,7 +18,6 @@ from .structures import MARK_GEN
from .structures import MarkDecorator from .structures import MarkDecorator
from .structures import MarkGenerator from .structures import MarkGenerator
from .structures import ParameterSet from .structures import ParameterSet
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import ExitCode from _pytest.config import ExitCode
from _pytest.config import hookimpl from _pytest.config import hookimpl

View File

@ -23,11 +23,10 @@ from typing import Iterator
from typing import Mapping from typing import Mapping
from typing import Optional from typing import Optional
from typing import Sequence from typing import Sequence
from typing import TYPE_CHECKING
import attr import attr
from _pytest.compat import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import NoReturn from typing import NoReturn

View File

@ -13,6 +13,7 @@ from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
@ -24,7 +25,6 @@ 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 ..compat import overload
from ..compat import TYPE_CHECKING
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

View File

@ -10,6 +10,7 @@ from typing import List
from typing import Optional from typing import Optional
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
@ -21,7 +22,6 @@ 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.compat import overload
from _pytest.compat import TYPE_CHECKING
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

View File

@ -18,6 +18,7 @@ from typing import List
from typing import Optional from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
from weakref import WeakKeyDictionary from weakref import WeakKeyDictionary
@ -30,7 +31,6 @@ 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.compat import overload
from _pytest.compat import TYPE_CHECKING
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

View File

@ -23,6 +23,7 @@ from typing import Mapping
from typing import Optional from typing import Optional
from typing import Set from typing import Set
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import py import py
@ -49,7 +50,6 @@ from _pytest.compat import REGEX_TYPE
from _pytest.compat import safe_getattr from _pytest.compat import safe_getattr
from _pytest.compat import safe_isclass from _pytest.compat import safe_isclass
from _pytest.compat import STRING_TYPES from _pytest.compat import STRING_TYPES
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import ExitCode from _pytest.config import ExitCode
from _pytest.config import hookimpl from _pytest.config import hookimpl

View File

@ -13,6 +13,7 @@ from typing import Generic
from typing import Optional from typing import Optional
from typing import Pattern from typing import Pattern
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
@ -20,7 +21,6 @@ import _pytest._code
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import overload from _pytest.compat import overload
from _pytest.compat import STRING_TYPES from _pytest.compat import STRING_TYPES
from _pytest.compat import TYPE_CHECKING
from _pytest.outcomes import fail from _pytest.outcomes import fail
if TYPE_CHECKING: if TYPE_CHECKING:

View File

@ -10,12 +10,12 @@ from typing import List
from typing import Optional from typing import Optional
from typing import Pattern from typing import Pattern
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar 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.compat import overload
from _pytest.compat import TYPE_CHECKING
from _pytest.fixtures import fixture from _pytest.fixtures import fixture
from _pytest.outcomes import fail from _pytest.outcomes import fail

View File

@ -8,6 +8,7 @@ from typing import Iterator
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
@ -27,7 +28,6 @@ from _pytest._code.code import ReprTraceback
from _pytest._code.code import TerminalRepr from _pytest._code.code import TerminalRepr
from _pytest._io import TerminalWriter from _pytest._io import TerminalWriter
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.nodes import Collector from _pytest.nodes import Collector
from _pytest.nodes import Item from _pytest.nodes import Item

View File

@ -9,6 +9,7 @@ from typing import Generic
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
from typing import Union from typing import Union
@ -23,7 +24,6 @@ from _pytest._code.code import ExceptionChainRepr
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 final from _pytest.compat import final
from _pytest.compat import TYPE_CHECKING
from _pytest.config.argparsing import Parser from _pytest.config.argparsing import Parser
from _pytest.nodes import Collector from _pytest.nodes import Collector
from _pytest.nodes import Item from _pytest.nodes import Item

View File

@ -6,10 +6,10 @@ import traceback
from typing import Generator from typing import Generator
from typing import Optional from typing import Optional
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
import attr import attr
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import hookimpl from _pytest.config import hookimpl
from _pytest.config.argparsing import Parser from _pytest.config.argparsing import Parser

View File

@ -20,6 +20,7 @@ from typing import Sequence
from typing import Set from typing import Set
from typing import TextIO from typing import TextIO
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import attr import attr
@ -34,7 +35,6 @@ from _pytest._code.code import ExceptionRepr
from _pytest._io.wcwidth import wcswidth from _pytest._io.wcwidth import wcswidth
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import order_preserving_dict from _pytest.compat import order_preserving_dict
from _pytest.compat import TYPE_CHECKING
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

View File

@ -9,13 +9,13 @@ from typing import Iterable
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import _pytest._code import _pytest._code
import pytest import pytest
from _pytest.compat import getimfunc from _pytest.compat import getimfunc
from _pytest.compat import is_async_function from _pytest.compat import is_async_function
from _pytest.compat import TYPE_CHECKING
from _pytest.config import hookimpl from _pytest.config import hookimpl
from _pytest.fixtures import FixtureRequest from _pytest.fixtures import FixtureRequest
from _pytest.nodes import Collector from _pytest.nodes import Collector

View File

@ -1,11 +1,11 @@
from typing import Any from typing import Any
from typing import Generic from typing import Generic
from typing import TYPE_CHECKING
from typing import TypeVar from typing import TypeVar
import attr import attr
from _pytest.compat import final from _pytest.compat import final
from _pytest.compat import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import Type # noqa: F401 (used in type string) from typing import Type # noqa: F401 (used in type string)

View File

@ -3,9 +3,9 @@ import warnings
from contextlib import contextmanager from contextlib import contextmanager
from typing import Generator from typing import Generator
from typing import Optional from typing import Optional
from typing import TYPE_CHECKING
import pytest import pytest
from _pytest.compat import TYPE_CHECKING
from _pytest.config import apply_warning_filters from _pytest.config import apply_warning_filters
from _pytest.config import Config from _pytest.config import Config
from _pytest.config import parse_warning_filter from _pytest.config import parse_warning_filter

View File

@ -7,6 +7,7 @@ import textwrap
from typing import Any from typing import Any
from typing import Dict from typing import Dict
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import py import py
@ -17,7 +18,6 @@ from _pytest._code.code import ExceptionChainRepr
from _pytest._code.code import ExceptionInfo from _pytest._code.code import ExceptionInfo
from _pytest._code.code import FormattedExcinfo from _pytest._code.code import FormattedExcinfo
from _pytest._io import TerminalWriter from _pytest._io import TerminalWriter
from _pytest.compat import TYPE_CHECKING
from _pytest.pytester import LineMatcher from _pytest.pytester import LineMatcher
try: try:

View File

@ -2,6 +2,7 @@ import enum
import sys import sys
from functools import partial from functools import partial
from functools import wraps from functools import wraps
from typing import TYPE_CHECKING
from typing import Union from typing import Union
import pytest import pytest
@ -12,7 +13,6 @@ from _pytest.compat import get_real_func
from _pytest.compat import is_generator from _pytest.compat import is_generator
from _pytest.compat import safe_getattr from _pytest.compat import safe_getattr
from _pytest.compat import safe_isclass from _pytest.compat import safe_isclass
from _pytest.compat import TYPE_CHECKING
from _pytest.outcomes import OutcomeException from _pytest.outcomes import OutcomeException
if TYPE_CHECKING: if TYPE_CHECKING:

View File

@ -6,6 +6,7 @@ from typing import Dict
from typing import List from typing import List
from typing import Sequence from typing import Sequence
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
import attr import attr
import py.path import py.path
@ -13,7 +14,6 @@ import py.path
import _pytest._code import _pytest._code
import pytest import pytest
from _pytest.compat import importlib_metadata from _pytest.compat import importlib_metadata
from _pytest.compat import TYPE_CHECKING
from _pytest.config import _get_plugin_specs_as_list from _pytest.config import _get_plugin_specs_as_list
from _pytest.config import _iter_rewritable_modules from _pytest.config import _iter_rewritable_modules
from _pytest.config import _strtobool from _pytest.config import _strtobool

View File

@ -4,13 +4,13 @@ from datetime import datetime
from typing import cast from typing import cast
from typing import List from typing import List
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
from xml.dom import minidom from xml.dom import minidom
import py import py
import xmlschema import xmlschema
import pytest import pytest
from _pytest.compat import TYPE_CHECKING
from _pytest.config import Config from _pytest.config import Config
from _pytest.junitxml import bin_xml_escape from _pytest.junitxml import bin_xml_escape
from _pytest.junitxml import LogXML from _pytest.junitxml import LogXML

View File

@ -4,11 +4,11 @@ import sys
import textwrap import textwrap
from typing import Dict from typing import Dict
from typing import Generator from typing import Generator
from typing import TYPE_CHECKING
import py import py
import pytest import pytest
from _pytest.compat import TYPE_CHECKING
from _pytest.monkeypatch import MonkeyPatch from _pytest.monkeypatch import MonkeyPatch
from _pytest.pytester import Testdir from _pytest.pytester import Testdir

View File

@ -5,6 +5,7 @@ import types
from typing import Dict from typing import Dict
from typing import List from typing import List
from typing import Tuple from typing import Tuple
from typing import TYPE_CHECKING
import py import py
@ -13,7 +14,6 @@ import pytest
from _pytest import outcomes from _pytest import outcomes
from _pytest import reports from _pytest import reports
from _pytest import runner from _pytest import runner
from _pytest.compat import TYPE_CHECKING
from _pytest.config import ExitCode from _pytest.config import ExitCode
from _pytest.outcomes import OutcomeException from _pytest.outcomes import OutcomeException