Skip to content

Don't duplicate Taggable when adding already-existing tag or removing non-existing tag #293

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

Merged
inducer merged 2 commits into from
Mar 27, 2025
Merged

Don't duplicate Taggable when adding already-existing tag or removing non-existing tag #293

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
234196d
don't duplicate taggable object when trying to add already-existing tag
majosm Mar 20, 2025
82d4e00
Use cheaper no-op check in Taggable.tagged/without_tags
inducer Mar 27, 2025
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
13 changes: 10 additions & 3 deletions pytools/tag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,12 @@ def tagged(self, tags: ToTagSetConvertible) -> Self:
:arg tags: An instance of :class:`~pytools.tag.Tag` or
an iterable with instances therein.
"""
return self._with_new_tags(
tags=check_tag_uniqueness(normalize_tags(tags) | self.tags))
normalized = normalize_tags(tags)
new_tags = check_tag_uniqueness(normalized | self.tags)
if normalized <= self.tags:
return self
else:
return self._with_new_tags(tags=new_tags)

def without_tags(self,
tags: ToTagSetConvertible, verify_existence: bool = True
Expand All @@ -297,7 +301,10 @@ def without_tags(self,
if verify_existence and len(new_tags) > len(self.tags) - len(to_remove):
raise ValueError("A tag specified for removal was not present.")

return self._with_new_tags(tags=check_tag_uniqueness(new_tags))
if to_remove & self.tags:
return self._with_new_tags(tags=check_tag_uniqueness(new_tags))
else:
return self

@memoize_method
def tags_of_type(self, tag_t: type[TagT]) -> frozenset[TagT]:
Expand Down
Loading