summaryrefslogtreecommitdiff
path: root/networkx/readwrite/json_graph
diff options
context:
space:
mode:
authorMridul Seth <seth.mridul@gmail.com>2015-05-23 16:56:04 +0530
committerMridul Seth <seth.mridul@gmail.com>2015-06-17 15:39:24 +0530
commit2b84ef1d2186dc46340df9ed958d3ce92150db08 (patch)
tree86ab0ef3e3bb3755fc72ae88d3d7ee59904d5bbf /networkx/readwrite/json_graph
parentda15b7b1111d39183cc3dfb1c8192859ff99ddc5 (diff)
downloadnetworkx-2b84ef1d2186dc46340df9ed958d3ce92150db08.tar.gz
Remove edges_iter, G.edges() now returns an iterator instead of list
Diffstat (limited to 'networkx/readwrite/json_graph')
-rw-r--r--networkx/readwrite/json_graph/node_link.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/networkx/readwrite/json_graph/node_link.py b/networkx/readwrite/json_graph/node_link.py
index 4a89fb5a..978eccaf 100644
--- a/networkx/readwrite/json_graph/node_link.py
+++ b/networkx/readwrite/json_graph/node_link.py
@@ -84,12 +84,12 @@ def node_link_data(G, attrs=_attrs):
data['links'] = [
dict(chain(d.items(),
[(source, mapping[u]), (target, mapping[v]), (key, k)]))
- for u, v, k, d in G.edges_iter(keys=True, data=True)]
+ for u, v, k, d in G.edges(keys=True, data=True)]
else:
data['links'] = [
dict(chain(d.items(),
[(source, mapping[u]), (target, mapping[v])]))
- for u, v, d in G.edges_iter(data=True)]
+ for u, v, d in G.edges(data=True)]
return data