remove errant attributes from non-strict field option renderings

Author: bckohan

django_enum/fields.py

@@ -333,15 +333,15 @@ def EnumField(  # pylint: disable=C0103
 
     .. code-block::
 
-    class MyModel(models.Model):
+        class MyModel(models.Model):
 
-        class EnumType(IntegerChoices):
+            class EnumType(IntegerChoices):
 
-            VAL1 = 1, _('Value 1')
-            VAL2 = 2, _('Value 2')
-            VAL3 = 3, _('Value 3')
+                VAL1 = 1, _('Value 1')
+                VAL2 = 2, _('Value 2')
+                VAL3 = 3, _('Value 3')
 
-        field_name = EnumField(EnumType)
+            field_name = EnumField(EnumType)
 
     :param enum: The class of the enumeration.
     :param field_args: Any standard unnamed field arguments for the underlying

django_enum/forms.py

@@ -23,16 +23,18 @@ class NonStrictSelect(Select):
     A Select widget for non-strict EnumChoiceFields that includes any existing
     non-conforming value as a choice option.
     """
+
     choices: Iterable[Tuple[Any, str]]
 
     def render(self, *args, **kwargs):
         """
         Before rendering if we're a non-strict field and our value is not
         one of our choices, we add it as an option.
         """
+
         value: Any = getattr(kwargs.get('value'), 'value', kwargs.get('value'))
         if (
-            value not in self.attrs.get('empty_values', [])
+            value not in EnumChoiceField.empty_values
             and value not in (
                 choice[0] for choice in self.choices
             )
@@ -120,6 +122,7 @@ def _coerce(self, value: Any) -> Union[Choices, Any]:
             non-strict field and the value is of a matching primitive type
         :raises ValidationError if a valid return value cannot be determined.
         """
+
         if value in self.empty_values:
             return self.empty_value
         if self.enum is not None and not isinstance(value, self.enum):
@@ -141,12 +144,6 @@ def _coerce(self, value: Any) -> Union[Choices, Any]:
                         ) from err
         return value
 
-    def widget_attrs(self, widget: Widget) -> Dict[Any, Any]:
-        attrs = super().widget_attrs(widget)
-        attrs.setdefault('empty_value', self.empty_value)
-        attrs.setdefault('empty_values', self.empty_values)
-        return attrs
-
     def prepare_value(self, value: Any) -> Any:
         """Must return the raw enumeration value type"""
         value = self._coerce(value)

django_enum/tests/tests.py

@@ -12,7 +12,6 @@
 from django.test import Client, TestCase
 from django.urls import reverse
 from django_enum import TextChoices
-from django_enum.forms import EnumChoiceField
 from django_enum.tests.djenum.enums import (
     BigIntEnum,
     BigPosIntEnum,
@@ -1059,10 +1058,10 @@ def verify_form(self, obj, soup, non_strict_options=False):
                         self.assertEqual(getattr(obj, field.name), value)
                     del expected[value]
                 except KeyError:  # pragma: no cover
-                    import pdb
-                    pdb.set_trace()
                     self.fail(
-                        f'{field.name} did not expect option {option["value"]}: {option.text}.')
+                        f'{field.name} did not expect option '
+                        f'{option["value"]}: {option.text}.'
+                    )
 
             self.assertEqual(len(expected), 0)