From 93ea7bdd587ab946b3c68ebd9ef52d3407704ae0 Mon Sep 17 00:00:00 2001 From: David Coudert Date: Sat, 13 Oct 2018 15:40:23 +0200 Subject: [PATCH] trac #26478: fix six import in graph_input.py --- src/sage/graphs/graph_input.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sage/graphs/graph_input.py b/src/sage/graphs/graph_input.py index 0c1f51eb2e2..c693e0e05e8 100644 --- a/src/sage/graphs/graph_input.py +++ b/src/sage/graphs/graph_input.py @@ -19,7 +19,7 @@ """ from __future__ import absolute_import, division -import six +from six import iteritems from six.moves import range @@ -425,9 +425,9 @@ def from_dict_of_dicts(G, M, loops=False, multiedges=False, weighted=False, conv raise ValueError("input dict must be a consistent format") if not loops: - if any(u in neighb for u,neighb in six.iteritems(M)): + if any(u in neighb for u,neighb in iteritems(M)): if loops is False: - u = next(u for u,neighb in six.iteritems(M) if u in neighb) + u = next(u for u,neighb in iteritems(M) if u in neighb) raise ValueError("the graph was built with loops=False but input M has a loop at {}".format(u)) loops = True if loops is None: @@ -492,9 +492,9 @@ def from_dict_of_lists(G, D, loops=False, multiedges=False, weighted=False): """ verts = set().union(D.keys(), *D.values()) if not loops: - if any(u in neighb for u, neighb in six.iteritems(D)): + if any(u in neighb for u, neighb in iteritems(D)): if loops is False: - u = next(u for u, neighb in six.iteritems(M) if u in neighb) + u = next(u for u, neighb in iteritems(D) if u in neighb) raise ValueError("the graph was built with loops=False but input D has a loop at {}".format(u)) loops = True if loops is None: