Skip to content

Commit 659168f

Browse files
committed
remove choicefieldmixin check - should be unnecessary
1 parent 1a04825 commit 659168f

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

src/django_enum/fields.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ def formfield(self, form_class=None, choices_form_class=None, **kwargs):
676676
# we try to pass in. Very annoying because we have to
677677
# un-encapsulate some of this initialization logic, this makes our
678678
# EnumChoiceField pretty ugly!
679-
from django_enum.forms import ChoiceFieldMixin, EnumChoiceField, NonStrictSelect
679+
from django_enum.forms import EnumChoiceField, NonStrictSelect
680680

681681
if not self.strict:
682682
kwargs.setdefault("widget", NonStrictSelect)
@@ -687,12 +687,9 @@ def formfield(self, form_class=None, choices_form_class=None, **kwargs):
687687
**kwargs,
688688
)
689689

690-
if isinstance(form_field, ChoiceFieldMixin):
691-
# we can't pass these in kwargs because formfield() strips them out
692-
form_field.enum = self.enum
693-
form_field.strict = self.strict
694-
form_field.primitive = self.primitive
695-
# pragma: no cover
690+
form_field.enum = self.enum
691+
form_field.strict = self.strict
692+
form_field.primitive = self.primitive
696693
return form_field
697694

698695
def get_choices(
@@ -1239,7 +1236,6 @@ def contribute_to_class(
12391236

12401237
def formfield(self, form_class=None, choices_form_class=None, **kwargs):
12411238
from django_enum.forms import (
1242-
ChoiceFieldMixin,
12431239
EnumFlagField,
12441240
FlagSelectMultiple,
12451241
NonStrictFlagSelectMultiple,
@@ -1261,11 +1257,9 @@ def formfield(self, form_class=None, choices_form_class=None, **kwargs):
12611257
)
12621258

12631259
# we can't pass these in kwargs because formfield() strips them out
1264-
if isinstance(form_field, ChoiceFieldMixin):
1265-
form_field.enum = self.enum
1266-
form_field.strict = self.strict
1267-
form_field.primitive = self.primitive
1268-
# pragma: no cover
1260+
form_field.enum = self.enum # type: ignore
1261+
form_field.strict = self.strict # type: ignore
1262+
form_field.primitive = self.primitive # type: ignore
12691263
return form_field
12701264

12711265
def get_choices(

0 commit comments

Comments
 (0)