|
3 | 3 | from __future__ import annotations
|
4 | 4 |
|
5 | 5 | import os
|
6 |
| -from contextlib import contextmanager |
| 6 | +from collections.abc import Generator, Iterable, Sequence |
| 7 | +from contextlib import AbstractContextManager, contextmanager |
7 | 8 | from functools import partial
|
8 |
| -from typing import ( |
9 |
| - TYPE_CHECKING, |
10 |
| - AbstractSet, |
11 |
| - Any, |
12 |
| - Callable, |
13 |
| - ContextManager, |
14 |
| - Generator, |
15 |
| - Iterable, |
16 |
| - List, |
17 |
| - Literal, |
18 |
| - Optional, |
19 |
| - Protocol, |
20 |
| - Sequence, |
21 |
| - Tuple, |
22 |
| - Union, |
23 |
| -) |
| 9 | +from typing import TYPE_CHECKING, Any, Callable, Literal, Optional, Protocol, Union |
24 | 10 |
|
25 | 11 | import pytest
|
26 | 12 |
|
|
37 | 23 |
|
38 | 24 |
|
39 | 25 | _DjangoDbDatabases = Optional[Union[Literal["__all__"], Iterable[str]]]
|
40 |
| -_DjangoDbAvailableApps = Optional[List[str]] |
| 26 | +_DjangoDbAvailableApps = Optional[list[str]] |
41 | 27 | # transaction, reset_sequences, databases, serialized_rollback, available_apps
|
42 |
| -_DjangoDb = Tuple[bool, bool, _DjangoDbDatabases, bool, _DjangoDbAvailableApps] |
| 28 | +_DjangoDb = tuple[bool, bool, _DjangoDbDatabases, bool, _DjangoDbAvailableApps] |
43 | 29 |
|
44 | 30 |
|
45 | 31 | __all__ = [
|
@@ -157,7 +143,7 @@ def _get_databases_for_test(test: pytest.Item) -> tuple[Iterable[str], bool]:
|
157 | 143 |
|
158 | 144 | def _get_databases_for_setup(
|
159 | 145 | items: Sequence[pytest.Item],
|
160 |
| -) -> tuple[AbstractSet[str], AbstractSet[str]]: |
| 146 | +) -> tuple[set[str], set[str]]: |
161 | 147 | """Get the database aliases that need to be setup, and the subset that needs
|
162 | 148 | to be serialized."""
|
163 | 149 | # Code derived from django.test.utils.DiscoverRunner.get_databases().
|
@@ -736,7 +722,7 @@ def __call__(
|
736 | 722 | *,
|
737 | 723 | using: str = ...,
|
738 | 724 | execute: bool = ...,
|
739 |
| - ) -> ContextManager[list[Callable[[], Any]]]: |
| 725 | + ) -> AbstractContextManager[list[Callable[[], Any]]]: |
740 | 726 | pass # pragma: no cover
|
741 | 727 |
|
742 | 728 |
|
|
0 commit comments