|
6 | 6 | import pytest |
7 | 7 |
|
8 | 8 | if sys.version_info >= (3, 13): |
9 | | - subinterpreters = pytest.importorskip("subinterpreters") |
| 9 | + subinterpreters = pytest.importorskip("_interpreters") |
10 | 10 | else: |
11 | 11 | subinterpreters = pytest.importorskip("_xxsubinterpreters") |
12 | 12 |
|
@@ -36,17 +36,27 @@ def test_multiple_imports_same_interpreter_ok(): |
36 | 36 | reason="PyPy and GraalPy do not support subinterpreters", |
37 | 37 | ) |
38 | 38 | def test_import_in_subinterpreter_forbidden(): |
| 39 | + sub_interpreter = subinterpreters.create() |
39 | 40 | if sys.version_info < (3, 12): |
40 | 41 | expected_error = "PyO3 modules do not yet support subinterpreters, see https://github.com/PyO3/pyo3/issues/576" |
41 | 42 | else: |
42 | 43 | expected_error = "module pyo3_pytests.pyo3_pytests does not support loading in subinterpreters" |
43 | 44 |
|
44 | | - sub_interpreter = subinterpreters.create() |
45 | | - with pytest.raises( |
46 | | - subinterpreters.RunFailedError, |
47 | | - match=expected_error, |
48 | | - ): |
49 | | - subinterpreters.run_string(sub_interpreter, "import pyo3_pytests.pyo3_pytests") |
| 45 | + if sys.version_info < (3, 13): |
| 46 | + # Python 3.12 subinterpreters had a special error for this |
| 47 | + with pytest.raises( |
| 48 | + subinterpreters.RunFailedError, |
| 49 | + match=expected_error, |
| 50 | + ): |
| 51 | + subinterpreters.run_string( |
| 52 | + sub_interpreter, "import pyo3_pytests.pyo3_pytests" |
| 53 | + ) |
| 54 | + else: |
| 55 | + res = subinterpreters.run_string( |
| 56 | + sub_interpreter, "import pyo3_pytests.pyo3_pytests" |
| 57 | + ) |
| 58 | + assert res.type.__name__ == "ImportError" |
| 59 | + assert res.msg == expected_error |
50 | 60 |
|
51 | 61 | subinterpreters.destroy(sub_interpreter) |
52 | 62 |
|
|
0 commit comments