style: Fix py 3.12 quality fixes

Author: farhan

src/openedx_content/applets/publishing/api.py

@@ -9,7 +9,7 @@
 
 from contextlib import nullcontext
 from datetime import datetime, timezone
-from typing import ContextManager, Optional
+from typing import ContextManager, Optional, cast
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import F, Prefetch, Q, QuerySet
@@ -854,7 +854,7 @@ def _create_side_effects_for_change_log(change_log: DraftChangeLog | PublishLog)
             # Update the current branch pointer (Draft or Published) for this
             # entity to point to the side_effect_change (if it's not already).
             if branch_cls == Published:
-                published_obj = affected  # 'affected' is the current Published object
+                published_obj = cast(Published, affected)
                 if published_obj.publish_log_record_id != side_effect_change.pk:
                     published_obj.publish_log_record = side_effect_change
                     branch_objs_to_update_with_side_effects.append(published_obj)

src/openedx_django_lib/fields.py

@@ -12,6 +12,7 @@
 
 import hashlib
 import uuid
+from typing import Any
 
 from django.db import models
 
@@ -124,7 +125,7 @@ def key_field(**kwargs) -> MultiCollationCharField:
     return case_sensitive_char_field(max_length=500, blank=False, **kwargs)
 
 
-def hash_field(**kwargs) -> models.CharField:
+def hash_field(**kwargs: Any) -> models.CharField:
     """
     Holds a hash digest meant to identify a piece of content.
 
@@ -145,13 +146,14 @@ def hash_field(**kwargs) -> models.CharField:
        didn't seem worthwhile, particularly the possibility of case-sensitivity
        related bugs.
     """
-    default_kwargs = {
+    default_kwargs: dict[str, Any] = {
         "max_length": 40,
         "blank": False,
         "null": False,
         "editable": False,
     }
-    return models.CharField(**(default_kwargs | kwargs))
+    merged: dict[str, Any] = {**default_kwargs, **kwargs}
+    return models.CharField(**merged)
 
 
 def manual_date_time_field() -> models.DateTimeField: