Increase Ruff lint coverage, fix lint errors

Author: crucialfelix

ajax_select/fields.py

@@ -100,15 +100,12 @@ def render(self, name, value, attrs=None, renderer=None, **_kwargs):
             objs = lookup.get_objects([value])
             try:
                 obj = objs[0]
-            except IndexError:
-                raise Exception(f"{lookup} cannot find object:{value}")
+            except IndexError as e:
+                raise Exception(f"{lookup} cannot find object:{value}") from e
             current_repr = lookup.format_item_display(obj)
             initial = [current_repr, obj.pk]
 
-        if self.show_help_text:
-            help_text = self.help_text
-        else:
-            help_text = ""
+        help_text = self.help_text if self.show_help_text else ""
 
         context = {
             "name": name,
@@ -153,7 +150,7 @@ def __init__(self, channel, *args, **kwargs):
         )
         widget_kwargs.update(kwargs.pop("widget_options", {}))
         kwargs["widget"] = AutoCompleteSelectWidget(**widget_kwargs)
-        super().__init__(max_length=255, *args, **kwargs)
+        super().__init__(*args, **kwargs, max_length=255)
 
     def clean(self, value):
         if value:
@@ -222,20 +219,18 @@ def render(self, name, value, attrs=None, renderer=None, **_kwargs):
         lookup = registry.get(self.channel)
 
         values = list(value)
-        if all([isinstance(v, Model) for v in values]):
-            objects = values
-        else:
-            objects = lookup.get_objects(values)
+        objects = (
+            values
+            if all([isinstance(v, Model) for v in values])
+            else lookup.get_objects(values)
+        )
 
         current_ids = pack_ids([obj.pk for obj in objects])
 
         # text repr of currently selected items
         initial = [[lookup.format_item_display(obj), obj.pk] for obj in objects]
 
-        if self.show_help_text:
-            help_text = self.help_text
-        else:
-            help_text = ""
+        help_text = self.help_text if self.show_help_text else ""
 
         context = {
             "name": name,
@@ -371,10 +366,7 @@ def render(self, name, value, attrs=None, renderer=None, **_kwargs):
         final_attrs.pop("required", None)
 
         lookup = registry.get(self.channel)
-        if self.show_help_text:
-            help_text = self.help_text
-        else:
-            help_text = ""
+        help_text = self.help_text if self.show_help_text else ""
 
         context = {
             "current_repr": initial,

ajax_select/helpers.py

@@ -45,14 +45,14 @@ class TheForm(superclass):
         class Meta:
             exclude = []
 
-        setattr(Meta, 'model', model)
+        Meta.model = model
         if hasattr(superclass, 'Meta'):
             if hasattr(superclass.Meta, 'fields'):
-                setattr(Meta, 'fields', superclass.Meta.fields)
+                Meta.fields = superclass.Meta.fields
             if hasattr(superclass.Meta, 'exclude'):
-                setattr(Meta, 'exclude', superclass.Meta.exclude)
+                Meta.exclude = superclass.Meta.exclude
             if hasattr(superclass.Meta, 'widgets'):
-                setattr(Meta, 'widgets', superclass.Meta.widgets)
+                Meta.widgets = superclass.Meta.widgets
 
     for model_fieldname, channel in fieldlist.items():
         f = make_ajax_field(model, model_fieldname, channel, show_help_text)
@@ -83,9 +83,7 @@ def make_ajax_field(related_model, fieldname_on_model, channel, show_help_text=F
     Returns:
         (AutoCompleteField, AutoCompleteSelectField, AutoCompleteSelectMultipleField): field
     """
-    from ajax_select.fields import AutoCompleteField, \
-        AutoCompleteSelectMultipleField, \
-        AutoCompleteSelectField
+    from ajax_select.fields import AutoCompleteField, AutoCompleteSelectField, AutoCompleteSelectMultipleField
 
     field = related_model._meta.get_field(fieldname_on_model)
     if 'label' not in kwargs:

ajax_select/registry.py

@@ -11,16 +11,17 @@ class LookupChannelRegistry:
     This includes any installed apps that contain lookup.py modules (django 1.7+)
     and any lookups that are explicitly declared in `settings.AJAX_LOOKUP_CHANNELS`
     """
+
     _registry = {}
 
     def load_channels(self):
         """
         Called when loading the application. Cannot be called a second time,
         (eg. for testing) as Django will not re-import and re-register anything.
         """
-        autodiscover_modules('lookups')
+        autodiscover_modules("lookups")
 
-        if hasattr(settings, 'AJAX_LOOKUP_CHANNELS'):
+        if hasattr(settings, "AJAX_LOOKUP_CHANNELS"):
             self.register(settings.AJAX_LOOKUP_CHANNELS)
 
     def register(self, lookup_specs):
@@ -54,9 +55,10 @@ def get(self, channel):
 
         try:
             lookup_spec = self._registry[channel]
-        except KeyError:
+        except KeyError as e:
             raise ImproperlyConfigured(
-                    f"No ajax_select LookupChannel named {channel!r} is registered.")
+                f"No ajax_select LookupChannel named {channel!r} is registered."
+            ) from e
 
         if (type(lookup_spec) is type) and issubclass(lookup_spec, LookupChannel):
             return lookup_spec()
@@ -68,12 +70,12 @@ def get(self, channel):
         elif isinstance(lookup_spec, dict):
             # 'channel' : dict(model='app.model', search_field='title' )
             #  generate a simple channel dynamically
-            return self.make_channel(lookup_spec['model'], lookup_spec['search_field'])
+            return self.make_channel(lookup_spec["model"], lookup_spec["search_field"])
         elif isinstance(lookup_spec, tuple):
             # a tuple
             # 'channel' : ('app.module','LookupClass')
             #  from app.module load LookupClass and instantiate
-            lookup_module = __import__(lookup_spec[0], {}, {}, [''])
+            lookup_module = __import__(lookup_spec[0], {}, {}, [""])
             lookup_class = getattr(lookup_module, lookup_spec[1])
             return lookup_class()
         else:
@@ -92,6 +94,7 @@ def make_channel(self, app_model, arg_search_field):
             LookupChannel
         """
         from ajax_select import LookupChannel
+
         app_label, model_name = app_model.split(".")
 
         class MadeLookupChannel(LookupChannel):
@@ -127,7 +130,7 @@ def format_item(self):
 
     def _wrapper(lookup_class):
         if not channel:
-            raise ValueError('Lookup Channel must have a channel name')
+            raise ValueError("Lookup Channel must have a channel name")
 
         registry.register({channel: lookup_class})
 

ajax_select/views.py

@@ -1,4 +1,5 @@
 import json
+
 from django.http import HttpResponse
 from django.utils.encoding import force_str
 
@@ -20,32 +21,36 @@ def ajax_lookup(request, channel):
     # in which case we'll support POST
     if request.method == "GET":
         # we could also insist on an ajax request
-        if 'term' not in request.GET:
-            return HttpResponse('')
-        query = request.GET['term']
+        if "term" not in request.GET:
+            return HttpResponse("")
+        query = request.GET["term"]
     else:
-        if 'term' not in request.POST:
-            return HttpResponse('')  # suspicious
-        query = request.POST['term']
+        if "term" not in request.POST:
+            return HttpResponse("")  # suspicious
+        query = request.POST["term"]
 
     lookup = registry.get(channel)
-    if hasattr(lookup, 'check_auth'):
+    if hasattr(lookup, "check_auth"):
         lookup.check_auth(request)
 
-    if len(query) >= getattr(lookup, 'min_length', 1):
-        instances = lookup.get_query(query, request)
-    else:
-        instances = []
-
-    results = json.dumps([
-        {
-            'pk': force_str(getattr(item, 'pk', None)),
-            'value': lookup.get_result(item),
-            'match': lookup.format_match(item),
-            'repr': lookup.format_item_display(item)
-        } for item in instances
-    ])
-
-    response = HttpResponse(results, content_type='application/json')
-    response['Cache-Control'] = 'max-age=0, must-revalidate, no-store, no-cache;'
+    instances = (
+        lookup.get_query(query, request)
+        if len(query) >= getattr(lookup, "min_length", 1)
+        else []
+    )
+
+    results = json.dumps(
+        [
+            {
+                "pk": force_str(getattr(item, "pk", None)),
+                "value": lookup.get_result(item),
+                "match": lookup.format_match(item),
+                "repr": lookup.format_item_display(item),
+            }
+            for item in instances
+        ]
+    )
+
+    response = HttpResponse(results, content_type="application/json")
+    response["Cache-Control"] = "max-age=0, must-revalidate, no-store, no-cache;"
     return response

example/example/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
-from example.forms import ReleaseForm
-from example.models import Author, Book, Group, Label, Person, Release, Song
 
 from ajax_select import make_ajax_form
 from ajax_select.admin import AjaxSelectAdmin, AjaxSelectAdminStackedInline, AjaxSelectAdminTabularInline
+from example.forms import ReleaseForm
+from example.models import Author, Book, Group, Label, Person, Release, Song
 
 
 @admin.register(Person)

example/example/forms.py

@@ -1,7 +1,7 @@
 from django.forms.models import ModelForm
-from example.models import Release
 
 from ajax_select import make_ajax_field
+from example.models import Release
 
 
 class ReleaseForm(ModelForm):

example/example/lookups.py

@@ -3,7 +3,6 @@
 
 import ajax_select
 from ajax_select import LookupChannel
-
 from example.models import Group, Person, Song
 
 

pyproject.toml

@@ -40,9 +40,19 @@ exclude = [
 ignore = []
 line-length = 120
 select = [
-    "C9",
+    # pycodestyle
     "E",
+    # Pyflakes
     "F",
+    # pyupgrade
+    "UP",
+    # flake8-bugbear
+    "B",
+    # flake8-simplify
+    "SIM",
+    # isort
+    "I",
+    "C9",
     "W",
 ]
 

tests/test_integration.py

@@ -13,7 +13,6 @@
 from ajax_select import fields
 from tests.models import Author, Book, Person
 
-
 # ---------------  setup ----------------------------------- #
 
 

tests/test_views.py

@@ -1,6 +1,5 @@
 from django.contrib.auth.models import User
-from django.test import Client
-from django.test import TestCase
+from django.test import Client, TestCase
 
 
 class TestViews(TestCase):