Update to ruff 0.9, fix warnings

course/content.py

@@ -28,6 +28,7 @@
 import os
 import re
 import sys
+from dataclasses import dataclass
 from typing import cast
 from xml.etree.ElementTree import Element, tostring
 
@@ -1195,9 +1196,9 @@ def unknown_decl(self, data):
         self.out_file.write(f"<![{data}]>")
 
 
+@dataclass
 class PreserveFragment:
-    def __init__(self, s: str) -> None:
-        self.s = s
+    s: str
 
 
 class LinkFixerTreeprocessor(Treeprocessor):

course/grades.py

@@ -24,6 +24,7 @@
 """
 
 import re
+from dataclasses import dataclass
 from decimal import Decimal
 from typing import (
     TYPE_CHECKING,
@@ -210,11 +211,10 @@ def view_grading_opportunity_list(pctx):
 
 # {{{ teacher grade book
 
+@dataclass
 class GradeInfo:
-    def __init__(self, opportunity: GradingOpportunity,
-            grade_state_machine: GradeStateMachine) -> None:
-        self.opportunity = opportunity
-        self.grade_state_machine = grade_state_machine
+    opportunity: GradingOpportunity
+    grade_state_machine: GradeStateMachine
 
 
 def get_grade_table(course: Course) -> tuple[

course/page/base.py

@@ -25,6 +25,7 @@
 
 from abc import ABC, abstractmethod
 from collections.abc import Callable, Sequence
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any
 
 import django.forms as forms
@@ -97,6 +98,7 @@
 """
 
 
+@dataclass
 class PageContext:
     """
     .. attribute:: course
@@ -113,24 +115,13 @@ class PageContext:
     which is used internally by the flow views.
     """
 
-    def __init__(
-            self,
-            course: Course,
-            repo: Repo_ish,
-            commit_sha: bytes,
-            flow_session: FlowSession,
-            in_sandbox: bool = False,
-            page_uri: str | None = None,
-            request: django.http.HttpRequest | None = None,
-            ) -> None:
-
-        self.course = course
-        self.repo = repo
-        self.commit_sha = commit_sha
-        self.flow_session = flow_session
-        self.in_sandbox = in_sandbox
-        self.page_uri = page_uri
-        self.request = request
+    course: Course
+    repo: Repo_ish
+    commit_sha: bytes
+    flow_session: FlowSession
+    in_sandbox: bool = False
+    page_uri: str | None = None
+    request: django.http.HttpRequest | None = None
 
 
 class PageBehavior:
@@ -194,11 +185,11 @@ def round_point_count_to_quarters(
         return int(value)
 
     import math
-    _atol = atol * 4
+    actual_atol = atol * 4
     v = value * 4
-    if abs(v - math.floor(v)) < _atol:
+    if abs(v - math.floor(v)) < actual_atol:
         v = math.floor(v)
-    elif abs(v - math.ceil(v)) < _atol:
+    elif abs(v - math.ceil(v)) < actual_atol:
         v = math.ceil(v)
     else:
         return value

course/validation.py

@@ -27,6 +27,7 @@
 import re
 import sys
 from collections.abc import Sequence
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Literal, TypeAlias
 
 import dulwich.objects
@@ -226,10 +227,10 @@ def validate_struct(
 # }}}
 
 
+@dataclass
 class ValidationWarning:
-    def __init__(self, location: str | None, text: str) -> None:
-        self.location = location
-        self.text = text
+    location: str | None
+    text: str
 
 
 class ValidationContext:
@@ -1588,10 +1589,10 @@ def tree(self):
         return FileSystemFakeRepoTree(self.root)
 
 
+@dataclass
 class FileSystemFakeRepoTreeEntry:  # pragma: no cover
-    def __init__(self, path: bytes, mode: int) -> None:
-        self.path = path
-        self.mode = mode
+    path: bytes
+    mode: int
 
 
 class FileSystemFakeRepoTree:  # pragma: no cover

pyproject.toml

@@ -125,7 +125,7 @@ urllib3 = "^2.3.0"
 
 [tool.poetry.dev-dependencies]
 factory_boy = "^3.3.1"
-ruff = "^0.8"
+ruff = "^0"
 
 django-stubs = { version ="5.1.*", extras = ["compatible-mypy"] }
 

tests/base_test_mixins.py

@@ -1639,7 +1639,7 @@ def get_page_visits(cls, course_identifier=None,
                         flow_session_id=None, page_ordinal=None, page_id=None,
                         **kwargs):
         query_kwargs = {}
-        if kwargs.get("answer_visit", False):
+        if kwargs.get("answer_visit"):
             query_kwargs.update({"answer__isnull": False})
         flow_params = cls.get_flow_params(course_identifier, flow_session_id)
         query_kwargs.update({"flow_session_id": flow_params["flow_session_id"]})

tests/test_content.py

@@ -28,6 +28,7 @@
 import stat
 import unittest
 from copy import deepcopy
+from dataclasses import dataclass
 from zoneinfo import ZoneInfo
 
 import pytest
@@ -334,9 +335,9 @@ def setUp(self):
     def test_file_uses_tab_in_indentation(self):
         fake_yaml_bytestream = b"\tabcd\n"
 
+        @dataclass
         class _Blob:
-            def __init__(self):
-                self.data = fake_yaml_bytestream
+            data: bytes = fake_yaml_bytestream
 
         with mock.patch("course.content.get_repo_blob") as mock_get_repo_blob:
             mock_get_repo_blob.return_value = _Blob()

tests/test_grades/test_grades.py

@@ -26,6 +26,7 @@
 import datetime
 import io
 import unittest
+from dataclasses import dataclass
 
 import pytest
 from django.test import Client, TestCase
@@ -659,9 +660,9 @@ def test(self):
 fake_task_id = "abcdef123"
 
 
+@dataclass
 class MockAsyncRes:
-    def __init__(self):
-        self.id = fake_task_id
+    id: str = fake_task_id
 
 
 class ViewGradesByOpportunityTest(GradesTestMixin, TestCase):