Activate more ruff rules

Author: matthiask

debug_toolbar/forms.py

@@ -38,8 +38,8 @@ def clean_signed(self):
                 signing.Signer(salt=self.salt).unsign(self.cleaned_data["signed"])
             )
             return verified
-        except signing.BadSignature:
-            raise ValidationError("Bad signature")
+        except signing.BadSignature as exc:
+            raise ValidationError("Bad signature") from exc
 
     def verified_data(self):
         return self.is_valid() and self.cleaned_data["signed"]

debug_toolbar/panels/headers.py

@@ -33,7 +33,7 @@ class HeadersPanel(Panel):
     template = "debug_toolbar/panels/headers.html"
 
     def process_request(self, request):
-        wsgi_env = list(sorted(request.META.items()))
+        wsgi_env = sorted(request.META.items())
         self.request_headers = {
             unmangle(k): v for (k, v) in wsgi_env if is_http_header(k)
         }

debug_toolbar/panels/history/panel.py

@@ -22,7 +22,7 @@ class HistoryPanel(Panel):
     def get_headers(self, request):
         headers = super().get_headers(request)
         observe_request = self.toolbar.get_observe_request()
-        store_id = getattr(self.toolbar, "store_id")
+        store_id = self.toolbar.store_id
         if store_id and observe_request(request):
             headers["djdt-store-id"] = store_id
         return headers

debug_toolbar/panels/profiling.py

@@ -13,7 +13,7 @@
 
 class FunctionCall:
     def __init__(
-        self, statobj, func, depth=0, stats=None, id=0, parent_ids=[], hsv=(0, 0.5, 1)
+        self, statobj, func, depth=0, stats=None, id=0, parent_ids=None, hsv=(0, 0.5, 1)
     ):
         self.statobj = statobj
         self.func = func
@@ -23,7 +23,7 @@ def __init__(
             self.stats = statobj.stats[func][:4]
         self.depth = depth
         self.id = id
-        self.parent_ids = parent_ids
+        self.parent_ids = parent_ids or []
         self.hsv = hsv
 
     def parent_classes(self):

debug_toolbar/panels/sql/forms.py

@@ -37,8 +37,8 @@ def clean_params(self):
 
         try:
             return json.loads(value)
-        except ValueError:
-            raise ValidationError("Is not valid JSON")
+        except ValueError as exc:
+            raise ValidationError("Is not valid JSON") from exc
 
     def clean_alias(self):
         value = self.cleaned_data["alias"]

debug_toolbar/panels/sql/panel.py

@@ -90,7 +90,7 @@ def _duplicate_query_key(query):
 
 def _process_query_groups(query_groups, databases, colors, name):
     counts = defaultdict(int)
-    for (alias, key), query_group in query_groups.items():
+    for (alias, _key), query_group in query_groups.items():
         count = len(query_group)
         # Queries are similar / duplicates only if there are at least 2 of them.
         if count > 1:

debug_toolbar/panels/templates/panel.py

@@ -192,9 +192,7 @@ def generate_stats(self, request, response):
             template = self.templates[0]["template"]
             # django templates have the 'engine' attribute, while jinja
             # templates use 'backend'
-            engine_backend = getattr(template, "engine", None) or getattr(
-                template, "backend"
-            )
+            engine_backend = getattr(template, "engine", None) or template.backend
             template_dirs = engine_backend.dirs
         else:
             context_processors = None

debug_toolbar/settings.py

@@ -83,6 +83,7 @@ def get_panels():
         warnings.warn(
             f"Please remove {logging_panel} from your DEBUG_TOOLBAR_PANELS setting.",
             DeprecationWarning,
+            stacklevel=1,
         )
     return PANELS
 

debug_toolbar/toolbar.py

@@ -86,7 +86,7 @@ def render_toolbar(self):
                     "The debug toolbar requires the staticfiles contrib app. "
                     "Add 'django.contrib.staticfiles' to INSTALLED_APPS and "
                     "define STATIC_URL in your settings."
-                )
+                ) from None
             else:
                 raise
 

pyproject.toml

@@ -66,24 +66,65 @@ source = ["src", ".tox/*/site-packages"]
 fail_under = 94
 show_missing = true
 
-[tool.ruff.isort]
-combine-as-imports = true
-
 [tool.ruff]
-select = [
-    # flake8/Pyflakes
-    "F",
-    # flake8/pycodestyle
-    "E",
-    "W",
-    # isort
-    "I",
-    # pyupgrade
-    "UP",
-    # pygrep-hooks
-    "PGH",
+extend-select = [
+  # pyflakes, pycodestyle
+  "F", "E", "W",
+  # mmcabe
+  # "C90",
+  # isort
+  "I",
+  # pep8-naming
+  # "N",
+  # pyupgrade
+  "UP",
+  # flake8-2020
+  # "YTT",
+  # flake8-boolean-trap
+  # "FBT",
+  # flake8-bugbear
+  "B",
+  # flake8-builtins
+  # "A",
+  # flake8-comprehensions
+  "C4",
+  # flake8-django
+  "DJ",
+  # flake8-logging-format
+  "G",
+  # flake8-pie
+  # "PIE",
+  # flake8-simplify
+  # "SIM",
+  # flake8-gettext
+  "INT",
+  # pygrep-hooks
+  "PGH",
+  # pylint
+  # "PL",
+  # unused noqa
+  "RUF100",
 ]
-ignore = [
-    "E501",
+extend-ignore = [
+  # Allow zip() without strict=
+  "B905",
+  # No line length errors
+  "E501",
 ]
+fix = true
+show-fixes = true
 target-version = "py38"
+
+[tool.ruff.isort]
+combine-as-imports = true
+
+[tool.ruff.mccabe]
+max-complexity = 15
+
+[tool.ruff.per-file-ignores]
+"*/migrat*/*" = [
+  # Allow using PascalCase model names in migrations
+  "N806",
+  # Ignore the fact that migration files are invalid module names
+  "N999",
+]

tests/context_processors.py

@@ -1,2 +1,2 @@
 def broken(request):
-    request.non_existing_attribute
+    _read = request.non_existing_attribute

tests/models.py

@@ -11,13 +11,22 @@ def __repr__(self):
 class Binary(models.Model):
     field = models.BinaryField()
 
+    def __str__(self):
+        return ""
+
 
 class PostgresJSON(models.Model):
     field = JSONField()
 
+    def __str__(self):
+        return ""
+
 
 if settings.USE_GIS:
     from django.contrib.gis.db import models as gismodels
 
     class Location(gismodels.Model):
         point = gismodels.PointField()
+
+        def __str__(self):
+            return ""