Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

stop circular imports

Syrus Dark46b4ccbf4ffd
diff --git a/manim/_config/logger_utils.py b/manim/_config/logger_utils.py
index 2e520a047..493337367 100644
--- a/manim/_config/logger_utils.py
+++ b/manim/_config/logger_utils.py
@@ -9,20 +9,22 @@ Both ``logger`` and ``console`` use the ``rich`` library to produce rich text
format.
"""
-
-from manim._config.utils import ManimConfig
-import os
-import logging
-import json
-import copy
import configparser
+import copy
+import json
+import logging
+import os
import typing
+from typing import TYPE_CHECKING
+
+from rich import color, errors
+from rich import print as printf
from rich.console import Console
from rich.logging import RichHandler
from rich.theme import Theme
-from rich import print as printf
-from rich import errors, color
+if TYPE_CHECKING:
+ from manim._config.utils import ManimConfig
HIGHLIGHTED_KEYWORDS = [ # these keywords are highlighted specially
"Played",
"animations",
@@ -132,7 +134,7 @@ def parse_theme(parser: configparser.ConfigParser) -> Theme:
return custom_theme
-def set_file_logger(config: ManimConfig, verbosity: str) -> None:
+def set_file_logger(config: "ManimConfig", verbosity: str) -> None:
"""Add a file handler to manim logger.
The path to the file is built using ``config.log_dir``.
diff --git a/manim/_config/utils.py b/manim/_config/utils.py
index 1ba9e3ef4..3114dc1f8 100644
--- a/manim/_config/utils.py
+++ b/manim/_config/utils.py
@@ -9,7 +9,7 @@ movie vs writing a single frame).
See :doc:`/tutorials/configuration` for an introduction to Manim's configuration system.
"""
-
+import argparse
import configparser
import copy
import logging
@@ -315,7 +315,7 @@ class ManimConfig(MutableMapping):
def __setitem__(self, key, val) -> None: # what is the type here?
getattr(ManimConfig, key).fset(self, val) # fset is the property's setter
- def update(self, obj: typing.Union[ManimConfig, dict]) -> None:
+ def update(self, obj: typing.Union['ManimConfig', dict]) -> None:
"""Digest the options found in another :class:`ManimConfig` or in a dict.
Similar to :meth:`dict.update`, replaces the values of this object with
@@ -364,7 +364,7 @@ class ManimConfig(MutableMapping):
raise AttributeError("'ManimConfig' object does not support item deletion")
# copy functions
- def copy(self) -> ManimConfig:
+ def copy(self) -> 'ManimConfig':
"""Deepcopy the contents of this ManimConfig.
Returns
@@ -383,11 +383,11 @@ class ManimConfig(MutableMapping):
"""
return copy.deepcopy(self)
- def __copy__(self) -> ManimConfig:
+ def __copy__(self) -> 'ManimConfig':
"""See ManimConfig.copy()."""
return copy.deepcopy(self)
- def __deepcopy__(self, memo) -> ManimConfig: # typing?
+ def __deepcopy__(self, memo) -> 'ManimConfig': # typing?
"""See ManimConfig.copy()."""
c = ManimConfig()
# Deepcopying the underlying dict is enough because all properties
@@ -445,7 +445,7 @@ class ManimConfig(MutableMapping):
)
# builders
- def digest_parser(self, parser: configparser.ConfigParser) -> ManimConfig:
+ def digest_parser(self, parser: configparser.ConfigParser) -> 'ManimConfig':
"""Process the config options present in a :class:`ConfigParser` object.
This method processes arbitrary parsers, not only those read from a
@@ -568,7 +568,7 @@ class ManimConfig(MutableMapping):
return self
- def digest_args(self, args: argparse.Namespace) -> ManimConfig:
+ def digest_args(self, args: argparse.Namespace) -> 'ManimConfig':
"""Process the config options present in CLI arguments.
Parameters
@@ -690,7 +690,7 @@ class ManimConfig(MutableMapping):
return self
- def digest_file(self, filename: str) -> ManimConfig:
+ def digest_file(self, filename: str) -> 'ManimConfig':
"""Process the config options present in a ``.cfg`` file.
This method processes a single ``.cfg`` file, whereas
@@ -1301,7 +1301,7 @@ class ManimConfig(MutableMapping):
class ManimFrame(Mapping):
- _OPTS: set[str] = {
+ _OPTS: typing.Set[str] = {
"pixel_width",
"pixel_height",
"aspect_ratio",
@@ -1314,7 +1314,7 @@ class ManimFrame(Mapping):
"left_side",
"right_side",
}
- _CONSTANTS: dict[str, np.ndarray] = {
+ _CONSTANTS: typing.Dict[str, np.ndarray] = {
"UP": np.array((0.0, 1.0, 0.0)),
"DOWN": np.array((0.0, -1.0, 0.0)),
"RIGHT": np.array((1.0, 0.0, 0.0)),