Skip to content

Commit

Permalink
Pull type definitions used for Generic[SubmobjectType] outside of if …
Browse files Browse the repository at this point in the history
…TYPE_CHECKING block
  • Loading branch information
3b1b committed Feb 8, 2024
1 parent 8417369 commit 2966f35
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions manimlib/mobject/mobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@
from manimlib.utils.space_ops import rotation_matrix_transpose

from typing import TYPE_CHECKING
from typing import TypeVar, Generic
SubmobjectType = TypeVar('SubmobjectType', bound='Mobject')


if TYPE_CHECKING:
from typing import Callable, Iterable, Iterator, Union, Tuple, Optional, TypeVar, Generic, List
from typing import Callable, Iterable, Iterator, Union, Tuple, Optional
import numpy.typing as npt
from manimlib.typing import ManimColor, Vect3, Vect4, Vect3Array, UniformDict, Self
from moderngl.context import Context
Expand All @@ -57,7 +60,6 @@
TimeBasedUpdater = Callable[["Mobject", float], "Mobject" | None]
NonTimeUpdater = Callable[["Mobject"], "Mobject" | None]
Updater = Union[TimeBasedUpdater, NonTimeUpdater]
SubmobjectType = TypeVar('SubmobjectType', bound='Mobject')


class Mobject(object):
Expand Down
6 changes: 3 additions & 3 deletions manimlib/mobject/types/vectorized_mobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
from manimlib.utils.space_ops import get_unit_normal
from manimlib.utils.space_ops import line_intersects_path
from manimlib.utils.space_ops import midpoint
from manimlib.utils.space_ops import normalize_along_axis
from manimlib.utils.space_ops import rotation_between_vectors
from manimlib.utils.space_ops import poly_line_length
from manimlib.utils.space_ops import z_to_vector
from manimlib.shader_wrapper import ShaderWrapper
from manimlib.shader_wrapper import FillShaderWrapper

from typing import TYPE_CHECKING
from typing import Generic, TypeVar
SubVmobjectType = TypeVar('SubVmobjectType', bound='VMobject')

if TYPE_CHECKING:
from typing import Callable, Iterable, Tuple, Any, Generic, TypeVar
from typing import Callable, Iterable, Tuple, Any
from manimlib.typing import ManimColor, Vect3, Vect4, Vect3Array, Vect4Array, Self
from moderngl.context import Context
SubVmobjectType = TypeVar('SubVmobjectType', bound='VMobject')

DEFAULT_STROKE_COLOR = GREY_A
DEFAULT_FILL_COLOR = GREY_C
Expand Down

0 comments on commit 2966f35

Please sign in to comment.