From 464117b4725b853feb15c965732526448128a45a Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Tue, 5 Jun 2018 10:20:36 +0200 Subject: [PATCH] fix imports in tests --- testing/test_capture.py | 2 +- testing/test_config.py | 8 ++------ testing/test_parseopt.py | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/testing/test_capture.py b/testing/test_capture.py index 5cedc99bb..e14b3af78 100644 --- a/testing/test_capture.py +++ b/testing/test_capture.py @@ -51,7 +51,7 @@ class TestCaptureManager(object): def test_getmethod_default_no_fd(self, monkeypatch): from _pytest.capture import pytest_addoption - from _pytest.config import Parser + from _pytest.config.argparsing import Parser parser = Parser() pytest_addoption(parser) diff --git a/testing/test_config.py b/testing/test_config.py index 56a51514d..5fb048364 100644 --- a/testing/test_config.py +++ b/testing/test_config.py @@ -4,12 +4,8 @@ import textwrap import pytest import _pytest._code -from _pytest.config import ( - getcfg, - get_common_ancestor, - determine_setup, - _iter_rewritable_modules, -) +from _pytest.config.findpaths import getcfg, get_common_ancestor, determine_setup +from _pytest.config import _iter_rewritable_modules from _pytest.main import EXIT_NOTESTSCOLLECTED diff --git a/testing/test_parseopt.py b/testing/test_parseopt.py index a8fc6d724..79076cafd 100644 --- a/testing/test_parseopt.py +++ b/testing/test_parseopt.py @@ -4,7 +4,7 @@ import sys import os import py import pytest -from _pytest import config as parseopt +from _pytest.config import argparsing as parseopt @pytest.fixture