Skip to content

Commit 4d2c709

Browse files
committed
fix imports after file rename
1 parent ad6542e commit 4d2c709

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/_pytest/mark/structures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
from .._code import getfslineno
2424
from ..compat import NOTSET
2525
from ..compat import NotSetType
26-
from _pytest._raises_group import AbstractRaises
2726
from _pytest.config import Config
2827
from _pytest.deprecated import check_ispytest
2928
from _pytest.deprecated import MARKED_FIXTURE
3029
from _pytest.outcomes import fail
30+
from _pytest.raises_group import AbstractRaises
3131
from _pytest.scope import _ScopeName
3232
from _pytest.warning_types import PytestUnknownMarkWarning
3333

src/_pytest/skipping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import traceback
1313
from typing import Optional
1414

15-
from _pytest._raises_group import AbstractRaises
1615
from _pytest.config import Config
1716
from _pytest.config import hookimpl
1817
from _pytest.config.argparsing import Parser
@@ -21,6 +20,7 @@
2120
from _pytest.outcomes import fail
2221
from _pytest.outcomes import skip
2322
from _pytest.outcomes import xfail
23+
from _pytest.raises_group import AbstractRaises
2424
from _pytest.reports import BaseReport
2525
from _pytest.reports import TestReport
2626
from _pytest.runner import CallInfo

src/pytest/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
from _pytest import __version__
77
from _pytest import version_tuple
88
from _pytest._code import ExceptionInfo
9-
from _pytest._raises_group import RaisesExc
10-
from _pytest._raises_group import RaisesGroup
11-
from _pytest._raises_group import RaisesGroup as raises_group
129
from _pytest.assertion import register_assert_rewrite
1310
from _pytest.cacheprovider import Cache
1411
from _pytest.capture import CaptureFixture
@@ -63,6 +60,9 @@
6360
from _pytest.python import Package
6461
from _pytest.python_api import approx
6562
from _pytest.python_api import raises
63+
from _pytest.raises_group import RaisesExc
64+
from _pytest.raises_group import RaisesGroup
65+
from _pytest.raises_group import RaisesGroup as raises_group
6666
from _pytest.recwarn import deprecated_call
6767
from _pytest.recwarn import WarningsRecorder
6868
from _pytest.recwarn import warns

testing/python/raises_group.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
from typing import TYPE_CHECKING
1010

1111
from _pytest._code import ExceptionInfo
12-
from _pytest._raises_group import RaisesExc
13-
from _pytest._raises_group import RaisesGroup
14-
from _pytest._raises_group import repr_callable
1512
from _pytest.outcomes import Failed
1613
from _pytest.pytester import Pytester
14+
from _pytest.raises_group import RaisesExc
15+
from _pytest.raises_group import RaisesGroup
16+
from _pytest.raises_group import repr_callable
1717
import pytest
1818

1919

0 commit comments

Comments
 (0)