Skip to content

Commit 014db22

Browse files
committed
some care in views.pyx
1 parent df43bcb commit 014db22

File tree

1 file changed

+20
-23
lines changed

1 file changed

+20
-23
lines changed

src/sage/graphs/views.pyx

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,7 @@ cdef class EdgesView:
412412
if self._graph._directed and self._ignore_direction:
413413
return 2 * self._graph.size()
414414
return self._graph.size()
415-
else:
416-
return sum(1 for _ in self)
415+
return sum(1 for _ in self)
417416

418417
def __repr__(self):
419418
"""
@@ -646,20 +645,20 @@ cdef class EdgesView:
646645
return (self._graph._backend.has_edge(u, v, label)
647646
or self._graph._backend.has_edge(v, u, label))
648647
return self._graph._backend.has_edge(u, v, label)
649-
else:
650-
if u not in self._vertex_set2 and v not in self._vertex_set2:
651-
return False
652-
if (self._vertex_set is not None
653-
and u not in self._vertex_set and v not in self._vertex_set):
648+
649+
if u not in self._vertex_set2 and v not in self._vertex_set2:
650+
return False
651+
if (self._vertex_set is not None
652+
and u not in self._vertex_set and v not in self._vertex_set):
653+
return False
654+
if self._graph._directed:
655+
if self._ignore_direction:
656+
return (self._graph._backend.has_edge(u, v, label)
657+
or self._graph._backend.has_edge(v, u, label))
658+
elif ((self._vertex_set is not None and u not in self._vertex_set)
659+
or v not in self._vertex_set2):
654660
return False
655-
if self._graph._directed:
656-
if self._ignore_direction:
657-
return (self._graph._backend.has_edge(u, v, label)
658-
or self._graph._backend.has_edge(v, u, label))
659-
elif ((self._vertex_set is not None and u not in self._vertex_set)
660-
or v not in self._vertex_set2):
661-
return False
662-
return self._graph._backend.has_edge(u, v, label)
661+
return self._graph._backend.has_edge(u, v, label)
663662

664663
def __getitem__(self, i):
665664
r"""
@@ -703,11 +702,10 @@ cdef class EdgesView:
703702
return list(self)[i]
704703
elif i < 0:
705704
return list(self)[i]
706-
else:
707-
try:
708-
return next(islice(self, i, i + 1, 1))
709-
except StopIteration:
710-
raise IndexError('index out of range')
705+
try:
706+
return next(islice(self, i, i + 1, 1))
707+
except StopIteration:
708+
raise IndexError('index out of range')
711709

712710
def __add__(left, right):
713711
"""
@@ -791,6 +789,5 @@ cdef class EdgesView:
791789
"""
792790
if isinstance(left, EdgesView):
793791
return list(left) * right
794-
else:
795-
# Case __rmul__
796-
return list(right) * left
792+
# Case __rmul__
793+
return list(right) * left

0 commit comments

Comments
 (0)