Refactor imports from collections.abc, typing and typing_extensions for Python 3.9

.github/scripts/ci_build_cairo.py

@@ -14,8 +14,8 @@
 import sys
 import tarfile
 import tempfile
-import typing
 import urllib.request
+from collections.abc import Generator
 from contextlib import contextmanager
 from pathlib import Path
 from sys import stdout
@@ -67,7 +67,7 @@ def run_command(command, cwd=None, env=None):
 
 
 @contextmanager
-def gha_group(title: str) -> typing.Generator:
+def gha_group(title: str) -> Generator:
     if not is_ci():
         yield
         return

manim/animation/animation.py

@@ -14,10 +14,10 @@
 __all__ = ["Animation", "Wait", "Add", "override_animation"]
 
 
-from collections.abc import Iterable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 from copy import deepcopy
 from functools import partialmethod
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from typing_extensions import Self
 

manim/animation/changing.py

@@ -4,10 +4,10 @@
 
 __all__ = ["AnimatedBoundary", "TracedPath"]
 
-from collections.abc import Sequence
-from typing import Callable
+from collections.abc import Callable, Sequence
+from typing import Any
 
-from typing_extensions import Any, Self
+from typing_extensions import Self
 
 from manim.mobject.mobject import Mobject
 from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL

manim/animation/composition.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 import types
-from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable, Iterable, Sequence
+from typing import TYPE_CHECKING
 
 import numpy as np
 

manim/animation/creation.py

@@ -76,8 +76,8 @@ def construct(self):
 
 
 import itertools as it
-from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable, Iterable, Sequence
+from typing import TYPE_CHECKING
 
 import numpy as np
 

manim/animation/fading.py

@@ -19,8 +19,9 @@ def construct(self):
     "FadeIn",
 ]
 
+from typing import Any
+
 import numpy as np
-from typing_extensions import Any
 
 from manim.mobject.opengl.opengl_mobject import OpenGLMobject
 

manim/animation/growing.py

@@ -31,15 +31,15 @@ def construct(self):
     "SpinInFromNothing",
 ]
 
-import typing
+from typing import TYPE_CHECKING
 
 import numpy as np
 
 from ..animation.transform import Transform
 from ..constants import PI
 from ..utils.paths import spiral_path
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from manim.mobject.geometry.line import Arrow
 
     from ..mobject.mobject import Mobject

manim/animation/indication.py

@@ -39,8 +39,7 @@ def construct(self):
     "Blink",
 ]
 
-from collections.abc import Iterable
-from typing import Callable
+from collections.abc import Callable, Iterable
 
 import numpy as np
 

manim/animation/numbers.py

@@ -5,9 +5,8 @@
 __all__ = ["ChangingDecimal", "ChangeDecimalToValue"]
 
 
-import typing
-
-from typing_extensions import Any
+from collections.abc import Callable
+from typing import Any
 
 from manim.mobject.text.numbers import DecimalNumber
 
@@ -54,7 +53,7 @@ def construct(self):
     def __init__(
         self,
         decimal_mob: DecimalNumber,
-        number_update_func: typing.Callable[[float], float],
+        number_update_func: Callable[[float], float],
         suspend_mobject_updating: bool = False,
         **kwargs: Any,
     ) -> None:

manim/animation/rotation.py

@@ -4,11 +4,10 @@
 
 __all__ = ["Rotating", "Rotate"]
 
-from collections.abc import Sequence
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable, Sequence
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
-from typing_extensions import Any
 
 from ..animation.animation import Animation
 from ..animation.transform import Transform

manim/animation/speedmodifier.py

@@ -4,7 +4,8 @@
 
 import inspect
 import types
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 from numpy import piecewise
 

manim/animation/transform.py

@@ -28,8 +28,8 @@
 
 import inspect
 import types
-from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 

manim/animation/updaters/mobject_update_utils.py

@@ -15,7 +15,8 @@
 
 
 import inspect
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 import numpy as np
 

manim/animation/updaters/update.py

@@ -6,14 +6,12 @@
 
 
 import operator as op
-import typing
-from typing import Callable
-
-from typing_extensions import Any
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 from manim.animation.animation import Animation
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from manim.mobject.mobject import Mobject
 
 

manim/camera/camera.py

@@ -8,9 +8,9 @@
 import itertools as it
 import operator as op
 import pathlib
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from functools import reduce
-from typing import Any, Callable
+from typing import Any
 
 import cairo
 import numpy as np

manim/camera/three_d_camera.py

@@ -5,7 +5,7 @@
 __all__ = ["ThreeDCamera"]
 
 
-from typing import Callable
+from collections.abc import Callable
 
 import numpy as np
 

manim/cli/checkhealth/checks.py

@@ -6,7 +6,8 @@
 
 import os
 import shutil
-from typing import Callable, Protocol, cast
+from collections.abc import Callable
+from typing import Protocol, cast
 
 __all__ = ["HEALTH_CHECKS"]
 

manim/cli/default_group.py

@@ -13,7 +13,8 @@
 from __future__ import annotations
 
 import warnings
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 import cloup
 

manim/mobject/frame.py

@@ -8,7 +8,7 @@
 ]
 
 
-from typing_extensions import Any
+from typing import Any
 
 from manim.mobject.geometry.polygram import Rectangle
 

manim/mobject/geometry/arc.py

@@ -44,7 +44,7 @@ def construct(self):
 
 import itertools
 import warnings
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import numpy as np
 from typing_extensions import Self
@@ -64,7 +64,6 @@ def construct(self):
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
-    from typing import Any
 
     import manim.mobject.geometry.tips as tips
     from manim.mobject.mobject import Mobject

manim/mobject/geometry/boolean_ops.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 from pathops import Path as SkiaPath
@@ -13,8 +13,6 @@
 from manim.mobject.types.vectorized_mobject import VMobject
 
 if TYPE_CHECKING:
-    from typing import Any
-
     from manim.typing import Point2DLike_Array, Point3D_Array, Point3DLike_Array
 
 from ...constants import RendererType

manim/mobject/geometry/labeled.py

@@ -4,7 +4,7 @@
 
 __all__ = ["Label", "LabeledLine", "LabeledArrow", "LabeledPolygram"]
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 
@@ -22,8 +22,6 @@
 from manim.utils.polylabel import polylabel
 
 if TYPE_CHECKING:
-    from typing import Any
-
     from manim.typing import Point3DLike_Array
 
 

manim/mobject/geometry/line.py

@@ -14,7 +14,7 @@
     "RightAngle",
 ]
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Literal
 
 import numpy as np
 
@@ -30,9 +30,7 @@
 from manim.utils.space_ops import angle_of_vector, line_intersection, normalize
 
 if TYPE_CHECKING:
-    from typing import Any
-
-    from typing_extensions import Literal, Self, TypeAlias
+    from typing_extensions import Self, TypeAlias
 
     from manim.typing import Point2DLike, Point3D, Point3DLike, Vector3D
     from manim.utils.color import ParsableManimColor

manim/mobject/geometry/polygram.py

@@ -18,7 +18,7 @@
 
 
 from math import ceil
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Literal
 
 import numpy as np
 
@@ -32,8 +32,6 @@
 from manim.utils.space_ops import angle_between_vectors, normalize, regular_vertices
 
 if TYPE_CHECKING:
-    from typing import Any, Literal
-
     import numpy.typing as npt
     from typing_extensions import Self
 

manim/mobject/geometry/tips.py

@@ -13,7 +13,7 @@
     "StealthTip",
 ]
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 
@@ -25,8 +25,6 @@
 from manim.utils.space_ops import angle_of_vector
 
 if TYPE_CHECKING:
-    from typing import Any
-
     from manim.typing import Point3D, Vector3D
 
 

manim/mobject/graphing/coordinate_systems.py

@@ -13,8 +13,8 @@
 
 import fractions as fr
 import numbers
-from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, overload
+from collections.abc import Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Any, TypeVar, overload
 
 import numpy as np
 from typing_extensions import Self

manim/mobject/graphing/functions.py

@@ -5,8 +5,8 @@
 __all__ = ["ParametricFunction", "FunctionGraph", "ImplicitFunction"]
 
 
-from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable, Iterable, Sequence
+from typing import TYPE_CHECKING
 
 import numpy as np
 from isosurfaces import plot_isoline

manim/mobject/graphing/number_line.py

@@ -8,8 +8,8 @@
 __all__ = ["NumberLine", "UnitInterval"]
 
 
-from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable, Iterable, Sequence
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from manim.mobject.geometry.tips import ArrowTip

manim/mobject/logo.py

@@ -4,8 +4,9 @@
 
 __all__ = ["ManimBanner"]
 
+from typing import Any
+
 import svgelements as se
-from typing_extensions import Any
 
 from manim.animation.updaters.update import UpdateFromAlphaFunc
 from manim.mobject.geometry.arc import Circle