fix imports after file rename

src/_pytest/mark/structures.py

@@ -23,11 +23,11 @@
 from .._code import getfslineno
 from ..compat import NOTSET
 from ..compat import NotSetType
-from _pytest._raises_group import AbstractRaises
 from _pytest.config import Config
 from _pytest.deprecated import check_ispytest
 from _pytest.deprecated import MARKED_FIXTURE
 from _pytest.outcomes import fail
+from _pytest.raises_group import AbstractRaises
 from _pytest.scope import _ScopeName
 from _pytest.warning_types import PytestUnknownMarkWarning
 

src/_pytest/skipping.py

@@ -12,7 +12,6 @@
 import traceback
 from typing import Optional
 
-from _pytest._raises_group import AbstractRaises
 from _pytest.config import Config
 from _pytest.config import hookimpl
 from _pytest.config.argparsing import Parser
@@ -21,6 +20,7 @@
 from _pytest.outcomes import fail
 from _pytest.outcomes import skip
 from _pytest.outcomes import xfail
+from _pytest.raises_group import AbstractRaises
 from _pytest.reports import BaseReport
 from _pytest.reports import TestReport
 from _pytest.runner import CallInfo

src/pytest/__init__.py

@@ -6,9 +6,6 @@
 from _pytest import __version__
 from _pytest import version_tuple
 from _pytest._code import ExceptionInfo
-from _pytest._raises_group import RaisesExc
-from _pytest._raises_group import RaisesGroup
-from _pytest._raises_group import RaisesGroup as raises_group
 from _pytest.assertion import register_assert_rewrite
 from _pytest.cacheprovider import Cache
 from _pytest.capture import CaptureFixture
@@ -63,6 +60,9 @@
 from _pytest.python import Package
 from _pytest.python_api import approx
 from _pytest.python_api import raises
+from _pytest.raises_group import RaisesExc
+from _pytest.raises_group import RaisesGroup
+from _pytest.raises_group import RaisesGroup as raises_group
 from _pytest.recwarn import deprecated_call
 from _pytest.recwarn import WarningsRecorder
 from _pytest.recwarn import warns

testing/python/raises_group.py

@@ -9,11 +9,11 @@
 from typing import TYPE_CHECKING
 
 from _pytest._code import ExceptionInfo
-from _pytest._raises_group import RaisesExc
-from _pytest._raises_group import RaisesGroup
-from _pytest._raises_group import repr_callable
 from _pytest.outcomes import Failed
 from _pytest.pytester import Pytester
+from _pytest.raises_group import RaisesExc
+from _pytest.raises_group import RaisesGroup
+from _pytest.raises_group import repr_callable
 import pytest