File tree Expand file tree Collapse file tree 2 files changed +18
-8
lines changed Expand file tree Collapse file tree 2 files changed +18
-8
lines changed Original file line number Diff line number Diff line change 14
14
import sys
15
15
from collections .abc import Callable
16
16
17
- from _pytest .python_api import RaisesContext
18
-
19
17
if sys .version_info >= (3 , 10 ):
20
18
from typing import TypeAlias
21
19
else :
22
20
from typing_extensions import TypeAlias
23
21
22
+ try :
23
+ from _pytest .raises import RaisesExc
24
+ except ImportError :
25
+ from _pytest .python_api import RaisesContext # type: ignore[attr-defined]
26
+
27
+ RaisesExc : TypeAlias = RaisesContext [Exception ] # type: ignore[no-redef]
28
+
24
29
VersionCompareOp : TypeAlias = Callable [
25
30
[t .Any , t .Any ],
26
31
bool ,
@@ -75,10 +80,10 @@ def test_version_compare(
75
80
raises : type [Exception ] | bool ,
76
81
) -> None :
77
82
"""Assert version comparisons."""
78
- raises_ctx : RaisesContext [ Exception ] = (
83
+ raises_ctx : RaisesExc = (
79
84
pytest .raises (t .cast ("type[Exception]" , raises ))
80
85
if raises
81
- else t .cast ("RaisesContext[Exception] " , does_not_raise ())
86
+ else t .cast ("RaisesExc " , does_not_raise ())
82
87
)
83
88
with raises_ctx :
84
89
assert op (LooseVersion (a ), LooseVersion (b ))
Original file line number Diff line number Diff line change 14
14
import sys
15
15
from collections .abc import Callable
16
16
17
- from _pytest .python_api import RaisesContext
18
-
19
17
if sys .version_info >= (3 , 10 ):
20
18
from typing import TypeAlias
21
19
else :
22
20
from typing_extensions import TypeAlias
23
21
22
+ try :
23
+ from _pytest .raises import RaisesExc
24
+ except ImportError :
25
+ from _pytest .python_api import RaisesContext # type: ignore[attr-defined]
26
+
27
+ RaisesExc : TypeAlias = RaisesContext [Exception ] # type: ignore[no-redef]
28
+
24
29
VersionCompareOp : TypeAlias = Callable [
25
30
[t .Any , t .Any ],
26
31
bool ,
@@ -146,10 +151,10 @@ def test_version_compare(
146
151
raises : type [Exception ] | bool ,
147
152
) -> None :
148
153
"""Assert version comparisons."""
149
- raises_ctx : RaisesContext [ Exception ] = (
154
+ raises_ctx : RaisesExc = (
150
155
pytest .raises (t .cast ("type[Exception]" , raises ))
151
156
if raises
152
- else t .cast ("RaisesContext[Exception] " , does_not_raise ())
157
+ else t .cast ("RaisesExc " , does_not_raise ())
153
158
)
154
159
with raises_ctx :
155
160
assert op (LooseVersion (a ), LooseVersion (b ))
You can’t perform that action at this time.
0 commit comments