Apply some autofixes by ruff

These were audited by hand, and fix violations of a number of `ruff`
rules proactively.

ws/forms.py

@@ -41,7 +41,7 @@ def _bind_input(
     if initial:
         if isinstance(initial, bool):
             js_expr = 'true' if initial else 'false'
-        elif isinstance(initial, (str, int)):
+        elif isinstance(initial, str | int):
             js_expr = f"'{initial}'"  # (integers get string values)
         else:
             raise TypeError(f'Unexpected initial value {initial}')
@@ -445,7 +445,8 @@ def _allowed_program_choices(self, allowed_program_enums):
             allowed_program_enums = [self.instance.program_enum, *allowed_program_enums]
 
         for category, choices in enums.Program.choices():
-            assert isinstance(category, str) and isinstance(choices, list)
+            assert isinstance(category, str)
+            assert isinstance(choices, list)
             valid_choices = [
                 (value, label)
                 for (value, label) in choices

ws/lottery/handle.py

@@ -139,7 +139,7 @@ def _try_to_place(self, signup: models.SignUp) -> bool:
         return False
 
     def place_participant(self):
-        raise NotImplementedError()
+        raise NotImplementedError
         # (Place on trip or waitlist, then):
         # self.runner.mark_handled(self.participant)
 

ws/merge.py

@@ -111,7 +111,7 @@ def check_fk_tables(
     """
     non_handled = []
     for table, col, _ftable in _fk_tables(cursor, src_table, column):
-        if col not in expected.get(table, tuple()):
+        if col not in expected.get(table, ()):
             non_handled.append((table, col))
     if non_handled:
         missing = ','.join(f"{table}.{col}" for table, col in non_handled)

ws/migrations/0051_consistent_levels.py

@@ -1,5 +1,5 @@
 import re
-from typing import Dict, List, NamedTuple
+from typing import NamedTuple
 
 from django.db import migrations
 
@@ -25,7 +25,7 @@ class TripChange(NamedTuple):
     'BIS',
     'CIS',
 }
-updates: Dict[int, TripChange] = {
+updates: dict[int, TripChange] = {
     304: TripChange('B (below treeline), overnight', 'B'),
     314: TripChange('I', 'AI'),  # Flume
     958: TripChange('I', 'AI'),  # Flume
@@ -57,7 +57,7 @@ def make_levels_consistent(apps, schema_editor):
     """Change all old WS trips with a known level to have valid levels."""
     Trip = apps.get_model("ws", "Trip")
 
-    def _trips_with_punctuation_changes() -> List[Trip]:
+    def _trips_with_punctuation_changes() -> list[Trip]:
         normal_chars = set('ABCIS')
         special_chars = re.compile(r'[+ ,/\.-]')
         expected_chars = set('ABCIS+/,-. ').union(normal_chars)
@@ -88,7 +88,7 @@ def _trips_with_punctuation_changes() -> List[Trip]:
 
         return trips
 
-    trips_to_update: List[Trip] = []
+    trips_to_update: list[Trip] = []
 
     for trip in Trip.objects.filter(pk__in=updates):
         assert trip.level == updates[trip.pk].old_level, f"Unexpected {trip.level}"

ws/templatetags/membership_tags.py

@@ -1,5 +1,5 @@
+from collections.abc import Mapping
 from types import MappingProxyType
-from typing import Mapping
 
 from django import template
 

ws/tests/templatetags/test_email_tags.py

@@ -137,12 +137,12 @@ def test_html_template(self):
             [
                 f'<h2 style="{inline["h2"]}">',
                 f'  <a href="{url}" style="{inline["a"]}">Some Cool Upcoming Trip</a>',
-                f'</h2>',
+                '</h2>',
                 f'<h3 style="{inline["h3"]}">Sunday, December 14</h3>',
                 f'<p style="{inline["p"]}">',
                 f'  <ul style="{inline["ul"]}">',
                 f'      <li style="{inline["li"]}"><strong>Program</strong>: Winter (outside IAP)',
-                f'      </li>',
+                '      </li>',
                 f'      <li style="{inline["li"]}"><strong>Type</strong>: Hiking</li>',
                 f'      <li style="{inline["li"]}"><strong>Terrain level</strong>: C</li>',
                 f'    <li style="{inline["li"]}"><strong>Difficulty rating:</strong> Advanced</li>',

ws/urls.py

@@ -438,4 +438,4 @@
 except ImportError:
     pass
 else:
-    urlpatterns = [path('__debug__/', include(debug_toolbar.urls))] + urlpatterns
+    urlpatterns = [path('__debug__/', include(debug_toolbar.urls)), *urlpatterns]

ws/utils/signups.py

@@ -1,3 +1,5 @@
+import contextlib
+
 from django.contrib import messages
 from django.db import transaction
 from django.db.models import Q
@@ -86,10 +88,8 @@ def trip_or_wait(
         messages.success(request, "Signed up!")
 
     # Since the participant is now on the trip, we should be sure to remove any waitlist
-    try:
+    with contextlib.suppress(models.WaitListSignup.DoesNotExist):
         signup.waitlistsignup.delete()
-    except models.WaitListSignup.DoesNotExist:
-        pass
 
     return signup
 

ws/views/preferences.py

@@ -5,6 +5,7 @@
 paired with another participant. All of these options are deemed "preferences"
 of the participant.
 """
+import contextlib
 import json
 from datetime import datetime
 
@@ -40,10 +41,9 @@ def get_form_kwargs(self):
         """Edit existing instance, prevent user from pairing with self."""
         kwargs = super().get_form_kwargs()
         kwargs['participant'] = participant = self.request.participant
-        try:
+        with contextlib.suppress(models.LotteryInfo.DoesNotExist):
             kwargs['instance'] = participant.lotteryinfo
-        except models.LotteryInfo.DoesNotExist:
-            pass
+
         return kwargs
 
     def form_valid(self, form):

ws/views/trips.py

@@ -149,7 +149,7 @@ def posted_feedback(self):
         will raise ValueError or TypeError (on either 'split' or `int`)
         """
         for key, comments in self.request.POST.items():
-            if not (key.startswith("par_") or key.startswith("flake_")):
+            if not (key.startswith(('par_', 'flake_'))):
                 continue
 
             feedback_type, par_pk = key.split('_')

ws/widgets.py

@@ -62,7 +62,7 @@ def render(self, name, value, attrs=None, renderer=None):
 
         ng_model_init = {
             'data-ng-model': ng_model,
-            'data-ng-init': f"{ng_model} = '{value or str()}'",
+            'data-ng-init': f"{ng_model} = '{value or ''}'",
             'value': str(value) if value else '',
         }