refactor: use 'type' keyword instead of TypeAlias

Author: bradenmacdonald

src/openedx_content/applets/components/models.py

@@ -17,7 +17,7 @@
 """
 from __future__ import annotations
 
-from typing import ClassVar, NewType, TypeAlias, cast
+from typing import ClassVar, NewType, cast
 
 from django.db import models
 from typing_extensions import deprecated
@@ -133,7 +133,7 @@ class Component(PublishableEntityMixin):
     that will exist for as long as the LearningPackage itself exists.
     """
 
-    ID: TypeAlias = ComponentID
+    type ID = ComponentID
 
     @property
     def id(self) -> ComponentID:

src/openedx_content/applets/containers/models.py

@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import NewType, TypeAlias, cast, final
+from typing import NewType, cast, final
 
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -165,7 +165,7 @@ class Container(PublishableEntityMixin):
     entities for different learners or at different times.
     """
 
-    ID: TypeAlias = ContainerID
+    type ID = ContainerID
 
     type_code: str  # Subclasses must override this, e.g. "unit"
     # olx_code: the OLX <tag_name> for XML serialization. Subclasses _may_ override this.

src/openedx_content/applets/publishing/models/learning_package.py

@@ -2,7 +2,7 @@
 LearningPackage model
 """
 
-from typing import NewType, TypeAlias
+from typing import NewType
 
 from django.db import models
 from typing_extensions import deprecated
@@ -30,9 +30,9 @@ class LearningPackage(models.Model):
     # uniqueness indexes on those foreign keys + their own fields, so the 4
     # bytes saved will add up over time.
     LearningPackageID = NewType("LearningPackageID", int)
-    ID: TypeAlias = LearningPackageID
+    type ID = LearningPackageID
 
-    class IDField(TypedBigAutoField[LearningPackageID]):
+    class IDField(TypedBigAutoField[ID]):
         pass
 
     id = IDField(primary_key=True)

src/openedx_content/applets/publishing/models/publishable_entity.py

@@ -6,7 +6,7 @@
 
 from datetime import datetime
 from functools import cached_property
-from typing import ClassVar, NewType, Self, TypeAlias
+from typing import ClassVar, NewType, Self
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
@@ -113,9 +113,9 @@ class PublishableEntity(models.Model):
     more convenient, like file access.
     """
     PublishableEntityID = NewType("PublishableEntityID", int)
-    ID: TypeAlias = PublishableEntityID
+    type ID = PublishableEntityID
 
-    class IDField(TypedBigAutoField[PublishableEntityID]):
+    class IDField(TypedBigAutoField[ID]):
         pass
 
     id = IDField(primary_key=True)

src/openedx_content/applets/sections/models.py

@@ -2,7 +2,7 @@
 Models that implement sections
 """
 
-from typing import NewType, TypeAlias, cast, override
+from typing import NewType, cast, override
 
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -29,7 +29,7 @@ class Section(Container):
     entities and can be added to other containers.
     """
 
-    ID: TypeAlias = SectionID
+    type ID = SectionID
 
     type_code = "section"
     olx_tag_name = "chapter"  # Serializes to OLX as `<chapter>...</chapter>`.

src/openedx_content/applets/subsections/models.py

@@ -2,7 +2,7 @@
 Models that implement subsections
 """
 
-from typing import NewType, TypeAlias, cast, override
+from typing import NewType, cast, override
 
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -29,7 +29,7 @@ class Subsection(Container):
     entities and can be added to other containers.
     """
 
-    ID: TypeAlias = SubsectionID
+    type ID = SubsectionID
 
     type_code = "subsection"
     olx_tag_name = "sequential"  # Serializes to OLX as `<sequential>...</sequential>`.

src/openedx_content/applets/units/models.py

@@ -2,7 +2,7 @@
 Models that implement units
 """
 
-from typing import NewType, TypeAlias, cast, override
+from typing import NewType, cast, override
 
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -27,7 +27,7 @@ class Unit(Container):
     entities and can be added to other containers.
     """
 
-    ID: TypeAlias = UnitID
+    type ID = UnitID
 
     type_code = "unit"
     olx_tag_name = "vertical"  # Serializes to OLX as `<unit>...</unit>`.

src/openedx_django_lib/id_fields.py

@@ -13,9 +13,9 @@ class TypedBigAutoField(models.BigAutoField):
     ```
     class MyModel(models.Model):
         MyModelID = NewType("MyModelID", int)
-        ID: TypeAlias = MyModelID
+        type ID = MyModelID
 
-        class IDField(TypedBigAutoField[MyModelID]):
+        class IDField(TypedBigAutoField[ID]):
             pass
 
         id = IDField(primary_key=True)