fix imports in tests

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)

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
 
 

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