Skip to content

Handle unhashable element input to list_update and list_difference_update #4975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nikolajmunk wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −8
Draft

Handle unhashable element input to list_update and list_difference_update #4975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions manim/utils/iterables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
Reversible,
Sequence,
)
from typing import TYPE_CHECKING, TypeVar, overload
from typing import TYPE_CHECKING, TypeVar, cast, overload

import numpy as np

T = TypeVar("T")
U = TypeVar("U")
F = TypeVar("F", np.float64, np.int_)
H = TypeVar("H", bound=Hashable)
J = TypeVar("J", bound=Hashable)


if TYPE_CHECKING:
Expand Down Expand Up @@ -133,21 +134,23 @@ def concatenate_lists(*list_of_lists: Iterable[T]) -> list[T]:
return [item for lst in list_of_lists for item in lst]


def list_difference_update(l1: Iterable[T], l2: Iterable[T]) -> list[T]:
def list_difference_update(l1: Iterable[H], l2: Iterable[J]) -> list[H]:
"""Returns a list containing all the elements of l1 not in l2.

Examples
--------
.. code-block:: pycon

>>> list_difference_update([1, 2, 3, 4], [2, 4])
[1, 3]
>>> list_difference_update([1, 2, 3, 4, 1], [2, 4])
[1, 3, 1]
"""
l2 = set(l2)
if not isinstance(l2, (set, dict, frozenset)):
# l2 is not a set-like object, so convert it to a set for faster lookups
l2 = set(l2)
return [e for e in l1 if e not in l2]


def list_update(l1: Iterable[T], l2: Iterable[T]) -> list[T]:
def list_update(l1: Iterable[H], l2: Iterable[J]) -> list[H | J]:
"""Used instead of ``set.update()`` to maintain order,
making sure duplicates are removed from l1, not l2.
Removes overlap of l1 and l2 and then concatenates l2 unchanged.
Expand All @@ -159,8 +162,9 @@ def list_update(l1: Iterable[T], l2: Iterable[T]) -> list[T]:
>>> list_update([1, 2, 3], [2, 4, 4])
[1, 3, 2, 4, 4]
"""
l2 = list(l2)
return list_difference_update(l1, l2) + l2
if not isinstance(l2, list):
l2 = list(l2)
return list_difference_update(l1, l2) + cast(list[H | J], l2)


@overload
Expand Down