Skip to content

Commit 0248aa5

Browse files
committed
Finish work
1 parent d8c47e3 commit 0248aa5

File tree

5 files changed

+194
-127
lines changed

5 files changed

+194
-127
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
version = "3.3.*"
22
upstream_repository = "https://github.com/django-import-export/django-import-export"
3+
requires = ["tablib"]

stubs/django-import-export/import_export/instance_loaders.pyi

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from collections.abc import Mapping
21
from typing import Any
32

43
from django.db.models import Model, QuerySet
@@ -8,13 +7,13 @@ from .fields import Field
87
from .resources import Resource
98

109
class BaseInstanceLoader:
11-
resource: Resource
10+
resource: Resource[Any]
1211
dataset: Dataset | None
13-
def __init__(self, resource: Resource, dataset: Dataset | None = None) -> None: ...
14-
def get_instance(self, row: Mapping[str, Any]) -> Model | None: ...
12+
def __init__(self, resource: Resource[Any], dataset: Dataset | None = None) -> None: ...
13+
def get_instance(self, row: dict[str, Any]) -> Model | None: ...
1514

1615
class ModelInstanceLoader(BaseInstanceLoader):
17-
def get_queryset(self) -> QuerySet: ...
16+
def get_queryset(self) -> QuerySet[Any]: ...
1817

1918
class CachedInstanceLoader(ModelInstanceLoader):
2019
pk_field: Field

stubs/django-import-export/import_export/mixins.pyi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ logger: Logger
1818
_ModelT = TypeVar("_ModelT", bound=Model)
1919

2020
class BaseImportExportMixin(Generic[_ModelT]):
21-
resource_class: type[Resource]
22-
resource_classes: SupportsGetItem[int, type[Resource]]
21+
resource_class: type[Resource[_ModelT]]
22+
resource_classes: SupportsGetItem[int, type[Resource[_ModelT]]]
2323
@property
2424
def formats(self) -> list[type[Format]]: ...
2525
@property
2626
def export_formats(self) -> list[type[Format]]: ...
2727
@property
2828
def import_formats(self) -> list[type[Format]]: ...
29-
def check_resource_classes(self, resource_classes: SupportsGetItem[int, type[Resource]]) -> None: ...
30-
def get_resource_classes(self) -> list[type[Resource]]: ...
29+
def check_resource_classes(self, resource_classes: SupportsGetItem[int, type[Resource[_ModelT]]]) -> None: ...
30+
def get_resource_classes(self) -> list[type[Resource[_ModelT]]]: ...
3131
def get_resource_kwargs(self, request: HttpRequest, *args: Any, **kwargs: Any) -> dict[str, Any]: ...
3232
def get_resource_index(self, form: Form) -> int: ...
3333

3434
class BaseImportMixin(BaseImportExportMixin[_ModelT]):
35-
def get_import_resource_classes(self) -> list[type[Resource]]: ...
35+
def get_import_resource_classes(self) -> list[type[Resource[_ModelT]]]: ...
3636
def get_import_formats(self) -> list[Format]: ...
3737
def get_import_resource_kwargs(self, request: HttpRequest, *args: Any, **kwargs: Any) -> dict[str, Any]: ...
38-
def choose_import_resource_class(self, form: Form) -> type[Resource]: ...
38+
def choose_import_resource_class(self, form: Form) -> type[Resource[_ModelT]]: ...
3939

4040
class BaseExportMixin(BaseImportExportMixin[_ModelT]):
4141
model: Model
@@ -47,8 +47,8 @@ class BaseExportMixin(BaseImportExportMixin[_ModelT]):
4747
@property
4848
def should_escape_formulae(self) -> bool: ...
4949
def get_export_formats(self) -> list[Format]: ...
50-
def get_export_resource_classes(self) -> list[Resource]: ...
51-
def choose_export_resource_class(self, form: Form) -> Resource: ...
50+
def get_export_resource_classes(self) -> list[Resource[_ModelT]]: ...
51+
def choose_export_resource_class(self, form: Form) -> Resource[_ModelT]: ...
5252
def get_export_resource_kwargs(self, request: HttpRequest, *args: Any, **kwargs: Any) -> dict[str, Any]: ...
5353
def get_data_for_export(self, request: HttpRequest, queryset: QuerySet[_ModelT], *args: Any, **kwargs: Any) -> Dataset: ...
5454
def get_export_filename(self, file_format: Format) -> str: ...

0 commit comments

Comments
 (0)