Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Improve code quality by implementing suggestions from LGTM (#1934)

Laith Bahodi232bb8533833
diff --git a/manim/animation/animation.py b/manim/animation/animation.py
index 0e0c3ee67..30434f50a 100644
--- a/manim/animation/animation.py
+++ b/manim/animation/animation.py
@@ -5,7 +5,6 @@ from .. import logger
from ..mobject import mobject, opengl_mobject
from ..mobject.mobject import Mobject
from ..mobject.opengl_mobject import OpenGLMobject
-from ..utils.deprecation import deprecated
from ..utils.rate_functions import smooth
__all__ = ["Animation", "Wait", "override_animation"]
diff --git a/manim/animation/creation.py b/manim/animation/creation.py
index 65bd8959d..f3832b5c2 100644
--- a/manim/animation/creation.py
+++ b/manim/animation/creation.py
@@ -76,7 +76,6 @@ from typing import (
Callable,
Dict,
Iterable,
- List,
Optional,
Sequence,
Tuple,
@@ -96,7 +95,6 @@ from ..mobject.types.opengl_surface import OpenGLSurface
from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobject
from ..mobject.types.vectorized_mobject import VMobject
from ..utils.bezier import integer_interpolate
-from ..utils.deprecation import deprecated
from ..utils.rate_functions import double_smooth, linear, smooth
diff --git a/manim/animation/fading.py b/manim/animation/fading.py
index a317fb7d8..b5125a745 100644
--- a/manim/animation/fading.py
+++ b/manim/animation/fading.py
@@ -18,7 +18,7 @@ __all__ = [
"FadeIn",
]
-from typing import Callable, Optional, Union
+from typing import Optional, Union
import numpy as np
@@ -28,8 +28,6 @@ from ..animation.transform import Transform
from ..constants import DOWN, ORIGIN
from ..mobject.mobject import Group, Mobject
from ..scene.scene import Scene
-from ..utils.deprecation import deprecated
-from ..utils.rate_functions import there_and_back
class _Fade(Transform):
diff --git a/manim/animation/indication.py b/manim/animation/indication.py
index 79a7a1bd5..f3786e5f2 100644
--- a/manim/animation/indication.py
+++ b/manim/animation/indication.py
@@ -37,8 +37,7 @@ __all__ = [
"Wiggle",
]
-import typing
-from typing import Callable, Type, Union
+from typing import Callable, Iterable, Optional, Tuple, Type, Union
import numpy as np
from colour import Color
@@ -57,7 +56,6 @@ from ..mobject.shape_matchers import SurroundingRectangle
from ..mobject.types.vectorized_mobject import VGroup, VMobject
from ..utils.bezier import interpolate, inverse_interpolate
from ..utils.color import GREY, YELLOW
-from ..utils.deprecation import deprecated
from ..utils.rate_functions import smooth, there_and_back, wiggle
from ..utils.space_ops import normalize
@@ -153,9 +151,7 @@ class Indicate(Transform):
mobject: "Mobject",
scale_factor: float = 1.2,
color: str = YELLOW,
- rate_func: typing.Callable[
- [float, typing.Optional[float]], np.ndarray
- ] = there_and_back,
+ rate_func: Callable[[float, Optional[float]], np.ndarray] = there_and_back,
**kwargs
) -> None:
self.color = color
@@ -258,7 +254,7 @@ class Flash(AnimationGroup):
lines.add_updater(lambda l: l.move_to(self.point))
return lines
- def create_line_anims(self) -> typing.Iterable["ShowPassingFlash"]:
+ def create_line_anims(self) -> Iterable["ShowPassingFlash"]:
return [
ShowPassingFlash(
line,
@@ -308,7 +304,7 @@ class ShowPassingFlash(ShowPartial):
self.time_width = time_width
super().__init__(mobject, remover=True, **kwargs)
- def _get_bounds(self, alpha: float) -> typing.Tuple[float]:
+ def _get_bounds(self, alpha: float) -> Tuple[float]:
tw = self.time_width
upper = interpolate(0, 1 + tw, alpha)
lower = upper - tw
@@ -469,7 +465,7 @@ class ApplyWave(Homotopy):
def homotopy(
x: float, y: float, z: float, t: float
- ) -> typing.Tuple[float, float, float]:
+ ) -> Tuple[float, float, float]:
upper = interpolate(0, 1 + time_width, t)
lower = upper - time_width
relative_x = inverse_interpolate(x_min, x_max, x)
@@ -519,8 +515,8 @@ class Wiggle(Animation):
scale_value: float = 1.1,
rotation_angle: float = 0.01 * TAU,
n_wiggles: int = 6,
- scale_about_point: typing.Optional[np.ndarray] = None,
- rotate_about_point: typing.Optional[np.ndarray] = None,
+ scale_about_point: Optional[np.ndarray] = None,
+ rotate_about_point: Optional[np.ndarray] = None,
run_time: float = 2,
**kwargs
) -> None:
diff --git a/manim/animation/movement.py b/manim/animation/movement.py
index 5c9db2fc1..2f7c40e7e 100644
--- a/manim/animation/movement.py
+++ b/manim/animation/movement.py
@@ -8,15 +8,14 @@ __all__ = [
"MoveAlongPath",
]
-import typing
-from typing import Any, Callable, Dict, Optional, Tuple
+from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Tuple
import numpy as np
from ..animation.animation import Animation
from ..utils.rate_functions import linear
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
from ..mobject.mobject import Mobject
diff --git a/manim/animation/transform.py b/manim/animation/transform.py
index ca3f304a9..1e3fc91f4 100644
--- a/manim/animation/transform.py
+++ b/manim/animation/transform.py
@@ -26,7 +26,7 @@ __all__ = [
import inspect
import types
-from typing import TYPE_CHECKING, Any, Callable, Iterable, List, Optional, Sequence
+from typing import TYPE_CHECKING, Any, Callable, Iterable, Optional, Sequence
import numpy as np
diff --git a/manim/animation/transform_matching_parts.py b/manim/animation/transform_matching_parts.py
index b7cacbdce..f8bef2654 100644
--- a/manim/animation/transform_matching_parts.py
+++ b/manim/animation/transform_matching_parts.py
@@ -10,7 +10,6 @@ import numpy as np
from .._config import config
from ..mobject.mobject import Group, Mobject
from ..mobject.opengl_mobject import OpenGLGroup, OpenGLMobject
-from ..mobject.svg.tex_mobject import MathTex
from ..mobject.types.opengl_vectorized_mobject import OpenGLVGroup, OpenGLVMobject
from ..mobject.types.vectorized_mobject import VGroup, VMobject
from .composition import AnimationGroup
diff --git a/manim/cli/new/group.py b/manim/cli/new/group.py
index 6cf13dc5b..e93075c09 100644
--- a/manim/cli/new/group.py
+++ b/manim/cli/new/group.py
@@ -159,7 +159,6 @@ def scene(**args):
# file exists so we are going to append new scene to that file
with open(file_name, "a") as f:
f.write("\n\n\n" + scene)
- pass
else:
# file does not exist so we create a new file, append the scene and prepend the import statement
with open(file_name, "w") as f:
diff --git a/manim/cli/render/commands.py b/manim/cli/render/commands.py
index c7f24f76c..f0ddc29b0 100644
--- a/manim/cli/render/commands.py
+++ b/manim/cli/render/commands.py
@@ -14,7 +14,7 @@ import cloup
import requests
from ... import __version__, config, console, error_console, logger
-from ...constants import CONTEXT_SETTINGS, EPILOG
+from ...constants import EPILOG
from ...utils.module_ops import scene_classes_from_file
from .ease_of_access_options import ease_of_access_options
from .global_options import global_options
diff --git a/manim/gui/gui.py b/manim/gui/gui.py
index fa0452a31..a49ed6a8a 100644
--- a/manim/gui/gui.py
+++ b/manim/gui/gui.py
@@ -2,7 +2,6 @@ from pathlib import Path
try:
import dearpygui.dearpygui as dpg
- from dearpygui.demo import show_demo
dearpygui_imported = True
except ImportError:
@@ -71,7 +70,6 @@ def configure_pygui(renderer, widgets, update=True):
getattr(dpg, f"add_{widget}")(name, **widget_config_copy)
else:
dpg.add_separator()
- # show_demo()
if not update:
dpg.start_dearpygui()
diff --git a/manim/mobject/coordinate_systems.py b/manim/mobject/coordinate_systems.py
index 0af554310..96eaa7d0e 100644
--- a/manim/mobject/coordinate_systems.py
+++ b/manim/mobject/coordinate_systems.py
@@ -33,13 +33,7 @@ from ..mobject.geometry import (
)
from ..mobject.number_line import NumberLine
from ..mobject.svg.tex_mobject import MathTex
-from ..mobject.types.vectorized_mobject import (
- Mobject,
- VDict,
- VectorizedPoint,
- VGroup,
- VMobject,
-)
+from ..mobject.types.vectorized_mobject import Mobject, VDict, VectorizedPoint, VGroup
from ..utils.color import (
BLACK,
BLUE,
@@ -874,7 +868,6 @@ class CoordinateSystem:
group = VGroup()
dx = dx or float(self.x_range[1] - self.x_range[0]) / 10
- dx_line_color = dx_line_color
dy_line_color = dy_line_color or graph.get_color()
p1 = self.input_to_graph_point(x, graph)
@@ -916,7 +909,6 @@ class CoordinateSystem:
group.df_label.set_color(group.df_line.get_color())
if include_secant_line:
- secant_line_color = secant_line_color
group.secant_line = Line(p1, p2, color=secant_line_color)
group.secant_line.scale_in_place(
secant_line_length / group.secant_line.get_length()
@@ -1517,12 +1509,6 @@ class NumberPlane(Axes):
**kwargs,
)
- # dynamically adjusts x_length and y_length so that the unit_size is one by default
- if x_length is None:
- x_length = self.x_range[1] - self.x_range[0]
- if y_length is None:
- y_length = self.y_range[1] - self.y_range[0]
-
self.init_background_lines()
def init_background_lines(self):
@@ -1854,10 +1840,6 @@ class PolarPlane(Axes):
**kwargs,
)
- # dynamically adjusts size so that the unit_size is one by default
- if size is None:
- size = 0
-
self.init_background_lines()
def init_background_lines(self):
diff --git a/manim/mobject/geometry.py b/manim/mobject/geometry.py
index ceddba58c..28783e404 100644
--- a/manim/mobject/geometry.py
+++ b/manim/mobject/geometry.py
@@ -65,6 +65,7 @@ __all__ = [
"ArrowSquareFilledTip",
]
+import itertools
import math
import warnings
from typing import Iterable, Optional, Sequence
@@ -81,11 +82,9 @@ from ..mobject.types.vectorized_mobject import DashedVMobject, VGroup, VMobject
from ..utils.color import *
from ..utils.deprecation import deprecated_params
from ..utils.iterables import adjacent_n_tuples, adjacent_pairs
-from ..utils.simple_functions import fdiv
from ..utils.space_ops import (
angle_between_vectors,
angle_of_vector,
- compass_directions,
line_intersection,
normalize,
perpendicular_bisector,
@@ -2204,11 +2203,11 @@ class ArcPolygon(VMobject, metaclass=ConvertToOpenGL):
if not arc_config:
if radius:
- all_arc_configs = [{"radius": radius} for pair in point_pairs]
+ all_arc_configs = itertools.repeat({"radius": radius}, len(point_pairs))
else:
- all_arc_configs = [{"angle": angle} for pair in point_pairs]
+ all_arc_configs = itertools.repeat({"angle": angle}, len(point_pairs))
elif isinstance(arc_config, dict):
- all_arc_configs = [arc_config for pair in point_pairs]
+ all_arc_configs = itertools.repeat(arc_config, len(point_pairs))
else:
assert len(arc_config) == n
all_arc_configs = arc_config
diff --git a/manim/mobject/graph.py b/manim/mobject/graph.py
index 492ac1669..66d2a0c23 100644
--- a/manim/mobject/graph.py
+++ b/manim/mobject/graph.py
@@ -16,7 +16,7 @@ from ..animation.composition import AnimationGroup
from ..animation.creation import Create, Uncreate
from ..utils.color import BLACK
from .geometry import Dot, LabeledDot, Line
-from .mobject import Group, Mobject, override_animate
+from .mobject import Mobject, override_animate
from .opengl_compatibility import ConvertToOpenGL
from .svg.tex_mobject import MathTex
from .types.vectorized_mobject import VMobject
diff --git a/manim/mobject/matrix.py b/manim/mobject/matrix.py
index aa4a590a3..d786dd859 100644
--- a/manim/mobject/matrix.py
+++ b/manim/mobject/matrix.py
@@ -43,7 +43,6 @@ import numpy as np
from ..constants import *
from ..mobject.numbers import DecimalNumber, Integer
-from ..mobject.shape_matchers import BackgroundRectangle
from ..mobject.svg.tex_mobject import MathTex, Tex
from ..mobject.types.vectorized_mobject import VGroup, VMobject
from ..utils.color import WHITE
diff --git a/manim/mobject/number_line.py b/manim/mobject/number_line.py
index 286178dfe..e918b66bb 100644
--- a/manim/mobject/number_line.py
+++ b/manim/mobject/number_line.py
@@ -35,7 +35,7 @@ class NumberLine(Line):
length : :class:`float`
The length of the number line.
unit_size : class:`float`
- The distance between each tick of the line.
+ The distance between each tick of the line. Overwritten by :attr:`length`, if specified.
include_ticks : :class:`bool`
Determines whether ticks are included.
tick_size : :class:`float`
diff --git a/manim/mobject/opengl_mobject.py b/manim/mobject/opengl_mobject.py
index 796dc6bb6..d023647d7 100644
--- a/manim/mobject/opengl_mobject.py
+++ b/manim/mobject/opengl_mobject.py
@@ -29,7 +29,6 @@ from ..utils.paths import straight_path
from ..utils.simple_functions import get_parameters
from ..utils.space_ops import (
angle_between_vectors,
- angle_of_vector,
normalize,
rotation_matrix_transpose,
)
diff --git a/manim/mobject/probability.py b/manim/mobject/probability.py
index 0da38dd56..0552ab99c 100644
--- a/manim/mobject/probability.py
+++ b/manim/mobject/probability.py
@@ -3,7 +3,6 @@
__all__ = ["SampleSpace", "BarChart"]
-import typing
from typing import Iterable, List
import numpy as np
diff --git a/manim/mobject/svg/brace.py b/manim/mobject/svg/brace.py
index a2ca19c56..fa3003f07 100644
--- a/manim/mobject/svg/brace.py
+++ b/manim/mobject/svg/brace.py
@@ -16,7 +16,6 @@ from ...constants import *
from ...mobject.geometry import Arc, Line
from ...mobject.svg.svg_path import SVGPathMobject
from ...mobject.svg.tex_mobject import MathTex, Tex
-from ...mobject.types.opengl_vectorized_mobject import OpenGLVMobject
from ...mobject.types.vectorized_mobject import VMobject
from ...utils.color import BLACK
diff --git a/manim/mobject/svg/svg_mobject.py b/manim/mobject/svg/svg_mobject.py
index 7a07a42ef..3c8c78618 100644
--- a/manim/mobject/svg/svg_mobject.py
+++ b/manim/mobject/svg/svg_mobject.py
@@ -14,7 +14,6 @@ from xml.dom.minidom import Element as MinidomElement
from xml.dom.minidom import parse as minidom_parse
import numpy as np
-from colour import Color
from ... import config, logger
from ...constants import *
diff --git a/manim/mobject/svg/svg_path.py b/manim/mobject/svg/svg_path.py
index 99277b354..1e9ef24fb 100644
--- a/manim/mobject/svg/svg_path.py
+++ b/manim/mobject/svg/svg_path.py
@@ -12,7 +12,6 @@ import numpy as np
from ... import config
from ...constants import *
-from ...utils.deprecation import deprecated
from ..opengl_compatibility import ConvertToOpenGL
from ..types.vectorized_mobject import VMobject
diff --git a/manim/mobject/svg/text_mobject.py b/manim/mobject/svg/text_mobject.py
index f54b575e1..2dd6bfcaa 100644
--- a/manim/mobject/svg/text_mobject.py
+++ b/manim/mobject/svg/text_mobject.py
@@ -53,10 +53,9 @@ import copy
import hashlib
import os
import re
-import typing
from contextlib import contextmanager
from pathlib import Path
-from typing import Dict
+from typing import Dict, Union
import manimpango
import numpy as np
@@ -1229,7 +1228,7 @@ class MarkupText(SVGMobject):
@contextmanager
-def register_font(font_file: typing.Union[str, Path]):
+def register_font(font_file: Union[str, Path]):
"""Temporarily add a font file to Pango's search path.
This searches for the font_file at various places. The order it searches it described below.
diff --git a/manim/mobject/table.py b/manim/mobject/table.py
index 7df3df7c8..b550a05f3 100644
--- a/manim/mobject/table.py
+++ b/manim/mobject/table.py
@@ -73,9 +73,8 @@ from ..animation.creation import *
from ..constants import *
from ..mobject.geometry import Line, Polygon
from ..mobject.numbers import DecimalNumber, Integer
-from ..mobject.shape_matchers import BackgroundRectangle
from ..mobject.svg.tex_mobject import MathTex
-from ..mobject.svg.text_mobject import Paragraph, Text
+from ..mobject.svg.text_mobject import Paragraph
from ..mobject.types.vectorized_mobject import VGroup, VMobject
from ..utils.color import BLACK, WHITE, YELLOW
diff --git a/manim/mobject/types/opengl_vectorized_mobject.py b/manim/mobject/types/opengl_vectorized_mobject.py
index 88a4e6de0..6ab3d7c34 100644
--- a/manim/mobject/types/opengl_vectorized_mobject.py
+++ b/manim/mobject/types/opengl_vectorized_mobject.py
@@ -1,8 +1,7 @@
import itertools as it
import operator as op
-import typing
from functools import reduce, wraps
-from typing import Optional
+from typing import Callable, Iterable, Optional, Tuple
import moderngl
import numpy as np
@@ -568,7 +567,7 @@ class OpenGLVMobject(OpenGLMobject):
def get_nth_curve_function_with_length(
self, n: int, sample_points: Optional[int] = None
- ) -> typing.Tuple[typing.Callable[[float], np.ndarray], float]:
+ ) -> Tuple[Callable[[float], np.ndarray], float]:
"""Returns the expression of the nth curve along with its (approximate) length.
Parameters
@@ -580,7 +579,7 @@ class OpenGLVMobject(OpenGLMobject):
Returns
-------
- curve : typing.Callable[[float], np.ndarray]
+ curve : Callable[[float], np.ndarray]
The function for the nth curve.
length : :class:`float`
The length of the nth curve.
@@ -604,12 +603,12 @@ class OpenGLVMobject(OpenGLMobject):
def get_curve_functions(
self,
- ) -> typing.Iterable[typing.Callable[[float], np.ndarray]]:
+ ) -> Iterable[Callable[[float], np.ndarray]]:
"""Gets the functions for the curves of the mobject.
Returns
-------
- typing.Iterable[typing.Callable[[float], np.ndarray]]
+ Iterable[Callable[[float], np.ndarray]]
The functions for the curves.
"""
@@ -620,7 +619,7 @@ class OpenGLVMobject(OpenGLMobject):
def get_curve_functions_with_lengths(
self, **kwargs
- ) -> typing.Iterable[typing.Tuple[typing.Callable[[float], np.ndarray], float]]:
+ ) -> Iterable[Tuple[Callable[[float], np.ndarray], float]]:
"""Gets the functions and lengths of the curves for the mobject.
Parameters
@@ -630,7 +629,7 @@ class OpenGLVMobject(OpenGLMobject):
Returns
-------
- typing.Iterable[typing.Tuple[typing.Callable[[float], np.ndarray], float]]
+ Iterable[Tuple[Callable[[float], np.ndarray], float]]
The functions and lengths of the curves.
"""
diff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.py
index 33dd4512f..b92aca12a 100644
--- a/manim/mobject/types/vectorized_mobject.py
+++ b/manim/mobject/types/vectorized_mobject.py
@@ -14,7 +14,6 @@ __all__ = [
import itertools as it
import sys
import typing
-from abc import ABCMeta
from typing import Optional, Sequence, Union
import colour
diff --git a/manim/mobject/value_tracker.py b/manim/mobject/value_tracker.py
index b6cba1066..67ce33716 100644
--- a/manim/mobject/value_tracker.py
+++ b/manim/mobject/value_tracker.py
@@ -3,8 +3,6 @@
__all__ = ["ValueTracker", "ComplexValueTracker"]
-from typing import Union
-
import numpy as np
from ..mobject.mobject import Mobject
diff --git a/manim/scene/scene.py b/manim/scene/scene.py
index f3274f87f..873543de1 100644
--- a/manim/scene/scene.py
+++ b/manim/scene/scene.py
@@ -8,8 +8,6 @@ import copy
import inspect
import platform
import random
-import string
-import sys
import threading
import time
import types
@@ -31,10 +29,9 @@ from ..animation.animation import Animation, Wait, prepare_animation
from ..camera.camera import Camera
from ..constants import *
from ..gui.gui import configure_pygui
-from ..mobject.mobject import Mobject, _AnimationBuilder
-from ..mobject.opengl_mobject import OpenGLMobject, OpenGLPoint
+from ..mobject.opengl_mobject import OpenGLPoint
from ..renderer.cairo_renderer import CairoRenderer
-from ..renderer.shader import Mesh, Object3D
+from ..renderer.shader import Object3D
from ..utils import opengl, space_ops
from ..utils.exceptions import EndSceneEarlyException, RerunSceneException
from ..utils.family import extract_mobject_family_members
diff --git a/manim/utils/debug.py b/manim/utils/debug.py
index 2938c205f..7cb781a6f 100644
--- a/manim/utils/debug.py
+++ b/manim/utils/debug.py
@@ -4,12 +4,9 @@
__all__ = ["print_family", "index_labels"]
-from os import replace
-
from ..mobject.numbers import Integer
from ..mobject.types.vectorized_mobject import VGroup
from .color import BLACK
-from .deprecation import deprecated
def print_family(mobject, n_tabs=0):
diff --git a/manim/utils/space_ops.py b/manim/utils/space_ops.py
index 855763fd7..37db5fedf 100644
--- a/manim/utils/space_ops.py
+++ b/manim/utils/space_ops.py
@@ -41,7 +41,6 @@ from mapbox_earcut import triangulate_float32 as earcut
from .. import config
from ..constants import DOWN, OUT, PI, RIGHT, TAU
-from ..utils.deprecation import deprecated
from ..utils.iterables import adjacent_pairs