Skip to content

fix: resolve IterableList names independently of list attributes #2283

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

Open
FanWu-ai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve IterableList names independently of list attributes #2283

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions git/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,7 +1382,7 @@ def __contains__(self, attr: object) -> bool:

# Otherwise make a full name search.
try:
getattr(self, cast(str, attr)) # Use cast to silence mypy.
self.__getattr__(cast(str, attr)) # Use cast to silence mypy.
return True
except (AttributeError, TypeError):
return False
Expand All @@ -1394,7 +1394,7 @@ def __getattr__(self, attr: str) -> T_IterableObj:
if getattr(item, self._id_attr) == attr:
return item
# END for each item
return list.__getattribute__(self, attr)
raise AttributeError(f"No item found with id {attr}")

def __getitem__( # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
self, index: Union[SupportsIndex, int, slice, str]
Expand All @@ -1405,7 +1405,7 @@ def __getitem__( # type: ignore[override] # pyright: ignore[reportIncompatible
raise ValueError("Index should be an int or str")
else:
try:
return getattr(self, cast(str, index))
return self.__getattr__(cast(str, index))
except AttributeError as e:
raise IndexError(f"No item found with id {self._prefix}{index}") from e
# END handle getattr
Expand Down
20 changes: 20 additions & 0 deletions test/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,3 +862,23 @@ def test_mode_str_to_int_accepts_bytes():
assert mode_str_to_int(b"100644") == 0o100644
assert mode_str_to_int("644") == 0o644
assert mode_str_to_int(b"120000") == 0o120000


@pytest.mark.parametrize("name", ["sort", "count", "append", "_prefix", "__class__", "ordinary"])
@pytest.mark.parametrize("prefix", ["", "refs/"])
def test_iterable_list_name_lookup_ignores_list_attributes(name, prefix):
values = IterableList("name", prefix)
member = _Member(prefix + name)
values.append(member)

assert values[name] is member
assert name in values
assert member in values
assert values[0] is member
assert callable(values.append)
assert callable(values.sort)

del values[name]
assert name not in values
with pytest.raises(IndexError, match="No item found with id"):
values[name]
Loading