Skip to content

Fix regression in DiDegreeView #14732

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
merged 1 commit into from
Sep 17, 2025
Merged

Fix regression in DiDegreeView #14732

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
14 changes: 14 additions & 0 deletions stubs/networkx/@tests/test_cases/check_tricky_function_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
from typing_extensions import assert_type

import networkx as nx
from networkx.classes.reportviews import DegreeView, DiDegreeView

# Test covariant dict type for `pos` in nx_latex functions
G: "nx.Graph[int]" = nx.Graph([(1, 2), (2, 3), (3, 4)])
Expand All @@ -9,3 +12,14 @@
nx.to_latex_raw(G, pos=pos2) # OK: dict[node, str]
pos3: dict[int, int] = {1: 1, 2: 3, 3: 5, 4: 7}
nx.to_latex_raw(G, pos=pos3) # type: ignore # dict keys must be str or collection

# Test that we don't confuse str and Iterable[str] in DiDegreeView.__call__
G_str = nx.Graph[str]()
di_degree_view = DiDegreeView(G_str)
assert_type(di_degree_view(""), int)
assert_type(di_degree_view([""]), DiDegreeView[str])
assert_type(di_degree_view({""}), DiDegreeView[str])
degree_view = DegreeView(G_str)
assert_type(degree_view(""), int)
assert_type(degree_view([""]), DegreeView[str])
assert_type(degree_view({""}), DegreeView[str])
17 changes: 10 additions & 7 deletions stubs/networkx/networkx/classes/reportviews.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ class NodeView(Mapping[_Node, dict[str, Any]], AbstractSet[_Node]):
@overload
def __call__(self, data: Literal[False] = False, default=None) -> Self: ...
@overload
def __call__(self, data: Literal[True] | str, default=None) -> Self: ...
def data(self, data: bool | str = True, default=None) -> Self: ...
def __call__(self, data: Literal[True] | str, default=None) -> NodeDataView[_Node]: ...
@overload
def data(self, data: Literal[False], default=None) -> Self: ...
@overload
def data(self, data: Literal[True] | str = True, default=None) -> NodeDataView[_Node]: ...

class NodeDataView(AbstractSet[_Node]):
__slots__ = ("_nodes", "_data", "_default")
Expand All @@ -57,12 +60,12 @@ class NodeDataView(AbstractSet[_Node]):

class DiDegreeView(Generic[_Node]):
def __init__(self, G: Graph[_Node], nbunch: _NBunch[_Node] = None, weight: None | bool | str = None) -> None: ...
@overload # Use this overload first in case _Node=str, since `str` matches `Iterable[str]`
def __call__(self, nbunch: _Node, weight: None | bool | str = None) -> int: ... # type: ignore[overload-overlap]
@overload
def __call__(self, nbunch: None = None, weight: None | bool | str = None) -> int: ... # type: ignore[overload-overlap]
@overload
def __call__(self, nbunch: None | Iterable[_Node], weight: None | bool | str = None) -> Self: ...
def __getitem__(self, n: _Node) -> float: ...
def __iter__(self) -> Iterator[tuple[_Node, float]]: ...
def __call__(self, nbunch: Iterable[_Node] | None = None, weight: None | bool | str = None) -> Self: ...
def __getitem__(self, n: _Node) -> int: ...
def __iter__(self) -> Iterator[tuple[_Node, int]]: ...
def __len__(self) -> int: ...

class DegreeView(DiDegreeView[_Node]): ...
Expand Down
Loading