From 80091a1a2fabdfb84f7e331003bf5a6f4f757d86 Mon Sep 17 00:00:00 2001 From: Richard Terry Date: Sun, 5 Jan 2020 00:02:50 +0000 Subject: [PATCH] Fix type errors --- fastview/forms.py | 13 +++++++------ fastview/views/inlines.py | 2 +- fastview/views/mixins.py | 5 ++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fastview/forms.py b/fastview/forms.py index f9b1955..b991504 100644 --- a/fastview/forms.py +++ b/fastview/forms.py @@ -2,18 +2,19 @@ Form classes """ -from typing import List, Optional +from typing import List -from django.forms import ModelForm, BaseInlineFormSet +from django.forms import BaseInlineFormSet, ModelForm class InlineParentModelForm(ModelForm): - formsets: Optional[List[BaseInlineFormSet]] + formsets: List[BaseInlineFormSet] - def add_formset(self, formset: BaseInlineFormSet): - if not hasattr(self, "formsets"): - self.formsets = [] + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.formsets = [] + def add_formset(self, formset: BaseInlineFormSet): self.formsets.append(formset) def is_valid(self): diff --git a/fastview/views/inlines.py b/fastview/views/inlines.py index 447912e..2e49578 100644 --- a/fastview/views/inlines.py +++ b/fastview/views/inlines.py @@ -6,7 +6,7 @@ from typing import Any, Dict, Optional, Type from django.db.models import Model -from django.forms import ModelForm, BaseInlineFormSet +from django.forms import BaseInlineFormSet, ModelForm from django.forms.models import inlineformset_factory from ..forms import InlineParentModelForm diff --git a/fastview/views/mixins.py b/fastview/views/mixins.py index 7d0cfd2..c069aa0 100644 --- a/fastview/views/mixins.py +++ b/fastview/views/mixins.py @@ -11,15 +11,13 @@ from django.urls import reverse from ..constants import INDEX_VIEW -from ..permissions import Denied, Permission from ..forms import InlineParentModelForm +from ..permissions import Denied, Permission from .display import AttributeValue, DisplayValue from .objects import AnnotatedObject if TYPE_CHECKING: - from django.forms import BaseInlineFormSet - from ..viewgroup import ViewGroup from .inlines import Inline @@ -243,6 +241,7 @@ class InlineMixin: # TODO: Consider merging with FormFieldMixin when adding support for nested inlines model: Model # Help type hinting to identify the intended base classes + get_form_kwargs: Callable # Help type hinting inlines: Optional[List[Inline]] = None def get_form(self, form_class=None):