Skip to content

Commit e5d7d84

Browse files
committed
Work around circular import
1 parent 4a1628a commit e5d7d84

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/_pytest/compat.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
"""
22
python version compatibility code
33
"""
4+
import sys # isort:skip
5+
6+
if sys.version_info < (3, 5, 2):
7+
from typing_extensions import TYPE_CHECKING
8+
else:
9+
from typing import TYPE_CHECKING
10+
411
import functools
512
import inspect
613
import io
714
import os
815
import re
9-
import sys
1016
from contextlib import contextmanager
1117
from inspect import Parameter
1218
from inspect import signature
@@ -28,10 +34,6 @@
2834
from _pytest.outcomes import fail
2935
from _pytest.outcomes import TEST_OUTCOME
3036

31-
if sys.version_info < (3, 5, 2):
32-
from typing_extensions import TYPE_CHECKING
33-
else:
34-
from typing import TYPE_CHECKING
3537

3638
if TYPE_CHECKING:
3739
from typing import Type # noqa: F401 (used in type string)

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ markers =
182182
[flake8]
183183
max-line-length = 120
184184
extend-ignore = E203
185+
per-file-ignores =
186+
src/_pytest/compat.py: E402
185187

186188
[isort]
187189
; This config mimics what reorder-python-imports does.

0 commit comments

Comments
 (0)