Refactor imports from collections.abc, typing and typing_extensions for Python 3.9 (#4353)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: chopan050

.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

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-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/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,13 @@ def construct(self):
     "SpinInFromNothing",
 ]
 
-import typing
+from typing import TYPE_CHECKING, Any
 
 from ..animation.transform import Transform
 from ..constants import PI
 from ..utils.paths import spiral_path
 
-if typing.TYPE_CHECKING:
-    from typing import Any
-
+if TYPE_CHECKING:
     from manim.mobject.geometry.line import Arrow
     from manim.mobject.opengl.opengl_mobject import OpenGLMobject
     from manim.typing import Point3DLike, Vector3DLike

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