Import Path from _pytest.pathlib for py35

This is important for `isinstance` checks etc.
This commit is contained in:
Daniel Hahler 2019-11-15 03:53:05 +01:00
parent 2fc7d04fc3
commit 5979837c60
6 changed files with 6 additions and 6 deletions

View File

@ -13,7 +13,6 @@ import struct
import sys import sys
import tokenize import tokenize
import types import types
from pathlib import Path
from typing import Dict from typing import Dict
from typing import List from typing import List
from typing import Optional from typing import Optional
@ -28,6 +27,7 @@ from _pytest.assertion.util import ( # noqa: F401
) )
from _pytest.compat import fspath from _pytest.compat import fspath
from _pytest.pathlib import fnmatch_ex from _pytest.pathlib import fnmatch_ex
from _pytest.pathlib import Path
from _pytest.pathlib import PurePath from _pytest.pathlib import PurePath
# pytest caches rewritten pycs in pycache dirs # pytest caches rewritten pycs in pycache dirs

View File

@ -8,7 +8,6 @@ import sys
import types import types
import warnings import warnings
from functools import lru_cache from functools import lru_cache
from pathlib import Path
from types import TracebackType from types import TracebackType
from typing import Any from typing import Any
from typing import Callable from typing import Callable
@ -40,6 +39,7 @@ from _pytest._code import filter_traceback
from _pytest.compat import importlib_metadata from _pytest.compat import importlib_metadata
from _pytest.outcomes import fail from _pytest.outcomes import fail
from _pytest.outcomes import Skipped from _pytest.outcomes import Skipped
from _pytest.pathlib import Path
from _pytest.warning_types import PytestConfigWarning from _pytest.warning_types import PytestConfigWarning
if False: # TYPE_CHECKING if False: # TYPE_CHECKING

View File

@ -9,7 +9,6 @@ import sys
import textwrap import textwrap
import zipfile import zipfile
from functools import partial from functools import partial
from pathlib import Path
import py import py
@ -23,6 +22,7 @@ from _pytest.assertion.rewrite import PYC_TAIL
from _pytest.assertion.rewrite import PYTEST_TAG from _pytest.assertion.rewrite import PYTEST_TAG
from _pytest.assertion.rewrite import rewrite_asserts from _pytest.assertion.rewrite import rewrite_asserts
from _pytest.main import ExitCode from _pytest.main import ExitCode
from _pytest.pathlib import Path
def setup_module(mod): def setup_module(mod):

View File

@ -1,7 +1,6 @@
import os import os
import sys import sys
import textwrap import textwrap
from pathlib import Path
import _pytest._code import _pytest._code
import pytest import pytest
@ -13,6 +12,7 @@ from _pytest.config.findpaths import determine_setup
from _pytest.config.findpaths import get_common_ancestor from _pytest.config.findpaths import get_common_ancestor
from _pytest.config.findpaths import getcfg from _pytest.config.findpaths import getcfg
from _pytest.main import ExitCode from _pytest.main import ExitCode
from _pytest.pathlib import Path
class TestParseIni: class TestParseIni:

View File

@ -1,12 +1,12 @@
import os import os
import textwrap import textwrap
from pathlib import Path
import py import py
import pytest import pytest
from _pytest.config import PytestPluginManager from _pytest.config import PytestPluginManager
from _pytest.main import ExitCode from _pytest.main import ExitCode
from _pytest.pathlib import Path
def ConftestWithSetinitial(path): def ConftestWithSetinitial(path):

View File

@ -1,7 +1,6 @@
import os import os
import platform import platform
from datetime import datetime from datetime import datetime
from pathlib import Path
from xml.dom import minidom from xml.dom import minidom
import py import py
@ -9,6 +8,7 @@ import xmlschema
import pytest import pytest
from _pytest.junitxml import LogXML from _pytest.junitxml import LogXML
from _pytest.pathlib import Path
from _pytest.reports import BaseReport from _pytest.reports import BaseReport