Make field arguments keyword-only and re-alphabetize them

Author: blag

src/django_nh3/forms.py

@@ -17,33 +17,33 @@ class Nh3Field(forms.CharField):
 
     def __init__(
         self,
-        tags: set[str] | None = None,
-        clean_content_tags: set[str] | None = None,
+        *args: Any,
         attributes: dict[str, set[str]] | None = None,
         attribute_filter: Callable[[str, str, str], str] | None = None,
-        strip_comments: bool = False,
-        link_rel: str = "",
+        clean_content_tags: set[str] | None = None,
+        empty_value: Any | None = None,
         generic_attribute_prefixes: set[str] | None = None,
-        tag_attribute_values: dict[str, dict[str, set[str]]] | None = None,
+        link_rel: str = "",
         set_tag_attribute_values: dict[str, dict[str, str]] | None = None,
+        strip_comments: bool = False,
+        tags: set[str] | None = None,
+        tag_attribute_values: dict[str, dict[str, set[str]]] | None = None,
         url_schemes: set[str] | None = None,
-        empty_value: Any | None = None,
-        *args: Any,
         **kwargs: dict[Any, Any],
     ):
         super().__init__(*args, **kwargs)
 
         self.empty_value = empty_value
         self.nh3_options = get_nh3_options(
-            tags=tags,
-            clean_content_tags=clean_content_tags,
             attributes=attributes,
             attribute_filter=attribute_filter,
-            strip_comments=strip_comments,
-            link_rel=link_rel,
+            clean_content_tags=clean_content_tags,
             generic_attribute_prefixes=generic_attribute_prefixes,
-            tag_attribute_values=tag_attribute_values,
+            link_rel=link_rel,
             set_tag_attribute_values=set_tag_attribute_values,
+            strip_comments=strip_comments,
+            tags=tags,
+            tag_attribute_values=tag_attribute_values,
             url_schemes=url_schemes,
         )
 

src/django_nh3/models.py

@@ -17,31 +17,31 @@
 class Nh3Field(models.TextField):
     def __init__(
         self,
-        tags: set[str] | None = None,
-        clean_content_tags: set[str] | None = None,
+        *args: Any,
         attributes: dict[str, set[str]] | None = None,
         attribute_filter: Callable[[str, str, str], str] | None = None,
-        strip_comments: bool = False,
-        link_rel: str = "",
+        clean_content_tags: set[str] | None = None,
         generic_attribute_prefixes: set[str] | None = None,
-        tag_attribute_values: dict[str, dict[str, set[str]]] | None = None,
+        link_rel: str = "",
         set_tag_attribute_values: dict[str, dict[str, str]] | None = None,
+        strip_comments: bool = False,
+        tags: set[str] | None = None,
+        tag_attribute_values: dict[str, dict[str, set[str]]] | None = None,
         url_schemes: set[str] | None = None,
-        *args: Any,
         **kwargs: Any,
     ) -> None:
         super().__init__(*args, **kwargs)
 
         self.nh3_options = get_nh3_options(
-            tags=tags,
-            clean_content_tags=clean_content_tags,
             attributes=attributes,
             attribute_filter=attribute_filter,
-            strip_comments=strip_comments,
-            link_rel=link_rel,
+            clean_content_tags=clean_content_tags,
             generic_attribute_prefixes=generic_attribute_prefixes,
-            tag_attribute_values=tag_attribute_values,
+            link_rel=link_rel,
             set_tag_attribute_values=set_tag_attribute_values,
+            strip_comments=strip_comments,
+            tags=tags,
+            tag_attribute_values=tag_attribute_values,
             url_schemes=url_schemes,
         )