Skip to content

Commit 69d40e2

Browse files
Fix <type> is not present at runtime errors (#2635)
1 parent 8565aa0 commit 69d40e2

File tree

6 files changed

+8
-31
lines changed

6 files changed

+8
-31
lines changed

django-stubs/contrib/gis/db/models/__init__.pyi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
from django.contrib.gis.db.models.aggregates import *
1+
from django.contrib.gis.db.models.aggregates import Collect as Collect
2+
from django.contrib.gis.db.models.aggregates import Extent as Extent
3+
from django.contrib.gis.db.models.aggregates import Extent3D as Extent3D
4+
from django.contrib.gis.db.models.aggregates import MakeLine as MakeLine
5+
from django.contrib.gis.db.models.aggregates import Union as Union
26
from django.contrib.gis.db.models.fields import GeometryCollectionField as GeometryCollectionField
37
from django.contrib.gis.db.models.fields import GeometryField as GeometryField
48
from django.contrib.gis.db.models.fields import LineStringField as LineStringField

django-stubs/db/models/__init__.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.core.exceptions import ObjectDoesNotExist
1+
from django.core.exceptions import ObjectDoesNotExist as ObjectDoesNotExist
22

33
from . import lookups as lookups
44
from . import signals as signals

django-stubs/db/models/fields/composite.pyi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class CompositeAttribute:
2222

2323
class CompositePrimaryKey(Field):
2424
field_names: tuple[str]
25+
descriptor_class: type[CompositeAttribute]
2526
def __init__(
2627
self,
2728
*args: str,

django-stubs/forms/__init__.pyi

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from django.core.exceptions import ValidationError as ValidationError
22

33
from .boundfield import BoundField as BoundField
4-
from .boundfield import BoundWidget as BoundWidget
54
from .fields import BooleanField as BooleanField
65
from .fields import CharField as CharField
76
from .fields import ChoiceField as ChoiceField
@@ -38,12 +37,8 @@ from .formsets import formset_factory as formset_factory
3837
from .models import BaseInlineFormSet as BaseInlineFormSet
3938
from .models import BaseModelForm as BaseModelForm
4039
from .models import BaseModelFormSet as BaseModelFormSet
41-
from .models import InlineForeignKeyField as InlineForeignKeyField
4240
from .models import ModelChoiceField as ModelChoiceField
43-
from .models import ModelChoiceIterator as ModelChoiceIterator
4441
from .models import ModelForm as ModelForm
45-
from .models import ModelFormMetaclass as ModelFormMetaclass
46-
from .models import ModelFormOptions as ModelFormOptions
4742
from .models import ModelMultipleChoiceField as ModelMultipleChoiceField
4843
from .models import fields_for_model as fields_for_model
4944
from .models import inlineformset_factory as inlineformset_factory
@@ -54,12 +49,10 @@ from .widgets import CheckboxInput as CheckboxInput
5449
from .widgets import CheckboxSelectMultiple as CheckboxSelectMultiple
5550
from .widgets import ClearableFileInput as ClearableFileInput
5651
from .widgets import DateInput as DateInput
57-
from .widgets import DateTimeBaseInput as DateTimeBaseInput
5852
from .widgets import DateTimeInput as DateTimeInput
5953
from .widgets import EmailInput as EmailInput
6054
from .widgets import FileInput as FileInput
6155
from .widgets import HiddenInput as HiddenInput
62-
from .widgets import Input as Input
6356
from .widgets import Media as Media
6457
from .widgets import MultipleHiddenInput as MultipleHiddenInput
6558
from .widgets import MultiWidget as MultiWidget

django-stubs/urls/resolvers.pyi

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from collections.abc import Callable, Iterator, Sequence
1+
from collections.abc import Callable, Sequence
22
from re import Pattern
33
from types import ModuleType
44
from typing import Any, TypeAlias, overload
@@ -36,8 +36,6 @@ class ResolverMatch:
3636
extra_kwargs: dict[str, Any] | None = ...,
3737
) -> None: ...
3838
def __getitem__(self, index: int) -> Any: ...
39-
# for tuple unpacking
40-
def __iter__(self) -> Iterator[Any]: ...
4139

4240
def get_resolver(urlconf: str | None = ...) -> URLResolver: ...
4341
def get_ns_resolver(ns_pattern: str, resolver: URLResolver, converters: tuple) -> URLResolver: ...

scripts/stubtest/allowlist_todo.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -351,19 +351,12 @@ django.contrib.gis.forms.BaseModelForm.__init__
351351
django.contrib.gis.forms.BaseModelForm.save_m2m
352352
django.contrib.gis.forms.BaseModelFormSet.model
353353
django.contrib.gis.forms.BaseModelFormSet.save_m2m
354-
django.contrib.gis.forms.BoundWidget
355354
django.contrib.gis.forms.ChoiceField.__deepcopy__
356-
django.contrib.gis.forms.DateTimeBaseInput
357355
django.contrib.gis.forms.Field.__deepcopy__
358356
django.contrib.gis.forms.Field.hidden_widget
359357
django.contrib.gis.forms.FileField.bound_data
360-
django.contrib.gis.forms.InlineForeignKeyField
361-
django.contrib.gis.forms.Input
362358
django.contrib.gis.forms.Media.__html__
363359
django.contrib.gis.forms.ModelChoiceField.__deepcopy__
364-
django.contrib.gis.forms.ModelChoiceIterator
365-
django.contrib.gis.forms.ModelFormMetaclass
366-
django.contrib.gis.forms.ModelFormOptions
367360
django.contrib.gis.forms.ModelMultipleChoiceField.hidden_widget
368361
django.contrib.gis.forms.MultiValueField.__deepcopy__
369362
django.contrib.gis.forms.MultiWidget.use_fieldset
@@ -1067,19 +1060,12 @@ django.forms.BaseModelForm.__init__
10671060
django.forms.BaseModelForm.save_m2m
10681061
django.forms.BaseModelFormSet.model
10691062
django.forms.BaseModelFormSet.save_m2m
1070-
django.forms.BoundWidget
10711063
django.forms.ChoiceField.__deepcopy__
1072-
django.forms.DateTimeBaseInput
10731064
django.forms.Field.__deepcopy__
10741065
django.forms.Field.hidden_widget
10751066
django.forms.FileField.bound_data
1076-
django.forms.InlineForeignKeyField
1077-
django.forms.Input
10781067
django.forms.Media.__html__
10791068
django.forms.ModelChoiceField.__deepcopy__
1080-
django.forms.ModelChoiceIterator
1081-
django.forms.ModelFormMetaclass
1082-
django.forms.ModelFormOptions
10831069
django.forms.ModelMultipleChoiceField.hidden_widget
10841070
django.forms.MultiValueField.__deepcopy__
10851071
django.forms.MultiWidget.use_fieldset
@@ -1192,16 +1178,11 @@ django.test.testcases.LiveServerThread.server_class
11921178
django.test.testcases.SerializeMixin.tearDownClass
11931179
django.test.testcases._AssertTemplateUsedContext.__init__
11941180
django.test.testcases._AssertTemplateUsedContext.message
1195-
django.urls.ResolverMatch.__iter__
11961181
django.urls.conf.path
11971182
django.urls.conf.re_path
11981183
django.urls.path
11991184
django.urls.re_path
12001185
django.urls.resolvers.LocaleRegexDescriptor.__get__
1201-
django.urls.resolvers.ResolverMatch.__iter__
1202-
django.contrib.gis.db.models.CompositePrimaryKey.descriptor_class
1203-
django.db.models.CompositePrimaryKey.descriptor_class
1204-
django.db.models.fields.composite.CompositePrimaryKey.descriptor_class
12051186

12061187
# mypy 1.9.0 new issues:
12071188
django.db.models.expressions.rhs

0 commit comments

Comments
 (0)