Enable deferred UP rules, require annotations future import

Author: inducer

accounts/admin.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2014 Andreas Kloeckner"
 
 __license__ = """

accounts/apps.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.apps import AppConfig
 from django.utils.translation import gettext_lazy as _
 

accounts/models.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2014 Andreas Kloeckner"
 
 __license__ = """

accounts/utils.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2018 Dong Zhuang"
 
 __license__ = """
@@ -143,7 +146,7 @@ def check_email_appellation_priority_list(self):
         if not custom_email_appellation_priority_list:
             return errors
 
-        if not isinstance(custom_email_appellation_priority_list, (list, tuple)):
+        if not isinstance(custom_email_appellation_priority_list, list | tuple):
             errors.append(Warning(
                 msg=("{}, {}".format(
                         INSTANCE_ERROR_PATTERN

course/admin.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2014 Andreas Kloeckner"
 
 __license__ = """
@@ -20,7 +23,7 @@
 THE SOFTWARE.
 """
 
-from typing import Any, Tuple
+from typing import Any
 
 from django import forms
 from django.contrib import admin
@@ -85,7 +88,7 @@ def _filter_participation_linked_obj_for_user(queryset, user):
 
 # {{{ list filter helper
 
-def _filter_related_only(filter_arg: str) -> Tuple[str, Any]:
+def _filter_related_only(filter_arg: str) -> tuple[str, Any]:
     return (filter_arg, admin.RelatedOnlyFieldListFilter)
 
 # }}}

course/analytics.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2014 Andreas Kloeckner"
 
 __license__ = """

course/apps.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.apps import AppConfig
 from django.utils.translation import gettext_lazy as _
 

course/calendar.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2014 Andreas Kloeckner"
 
 __license__ = """

course/constants.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __copyright__ = "Copyright (C) 2014 Andreas Kloeckner"
 
 __license__ = """
@@ -20,7 +23,6 @@
 THE SOFTWARE.
 """
 
-import typing
 
 from django.utils.translation import gettext, pgettext_lazy
 
@@ -296,7 +298,7 @@ class flow_session_expiration_mode:  # noqa
 
 
 def is_expiration_mode_allowed(
-        expmode: str, permissions: typing.FrozenSet[str]
+        expmode: str, permissions: frozenset[str]
         ) -> bool:
     if expmode == flow_session_expiration_mode.roll_over:
         if (flow_permission.set_roll_over_expiration_mode

course/content.py

@@ -28,7 +28,7 @@
 import os
 import re
 import sys
-from typing import Union, cast
+from typing import cast
 
 import dulwich.objects
 import dulwich.repo
@@ -51,10 +51,10 @@
 
 # {{{ mypy
 
+from collections.abc import Callable
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
 )
 
 
@@ -67,8 +67,8 @@
     from course.validation import FileSystemFakeRepoTree, ValidationContext
     from relate.utils import Repo_ish
 
-Date_ish = Union[datetime.datetime, datetime.date]
-Datespec = Union[datetime.datetime, datetime.date, str]
+Date_ish = datetime.datetime | datetime.date
+Datespec = datetime.datetime | datetime.date | str
 
 
 class ChunkRulesDesc(Struct):
@@ -662,7 +662,7 @@ def look_up_git_object(repo: dulwich.repo.Repo,
 
     from stat import S_ISLNK
     while name_parts:
-        if not isinstance(cur_lookup, (Tree, FileSystemFakeRepoTree)):
+        if not isinstance(cur_lookup, Tree | FileSystemFakeRepoTree):
             raise ObjectDoesNotExist(
                     _("'%s' is not a directory, cannot lookup nested names")
                     % os.sep.join(processed_name_parts))
@@ -719,7 +719,7 @@ def get_repo_tree(repo: Repo_ish, full_name: str, commit_sha: bytes) -> Tree_ish
 
     msg_full_name = full_name if full_name else _("(repo root)")
 
-    if isinstance(git_obj, (Tree, FileSystemFakeRepoTree)):
+    if isinstance(git_obj, Tree | FileSystemFakeRepoTree):
         return git_obj
     else:
         raise ObjectDoesNotExist(_("resource '%s' is not a tree") % msg_full_name)
@@ -749,7 +749,7 @@ def get_repo_blob(repo: Repo_ish, full_name: str, commit_sha: bytes) -> Blob_ish
 
     msg_full_name = full_name if full_name else _("(repo root)")
 
-    if isinstance(git_obj, (Blob, FileSystemFakeRepoFile)):
+    if isinstance(git_obj, Blob | FileSystemFakeRepoFile):
         return git_obj
     else:
         raise ObjectDoesNotExist(_("resource '%s' is not a file") % msg_full_name)