diff options
| author | Aric Hagberg <aric.hagberg@gmail.com> | 2014-06-03 07:08:43 -0600 |
|---|---|---|
| committer | Aric Hagberg <aric.hagberg@gmail.com> | 2014-06-03 07:08:43 -0600 |
| commit | eedbe3095d93e71ba454b4200d9be78e6b885d06 (patch) | |
| tree | 47f9ef3aab68fd5975fb8f7d35b26e1db76e3d62 | |
| parent | 35406bfc9645bae9585c74690575dfb074c98c3c (diff) | |
| download | networkx-eedbe3095d93e71ba454b4200d9be78e6b885d06.tar.gz | |
Better exception handling, simpler test
| -rw-r--r-- | networkx/readwrite/pajek.py | 4 | ||||
| -rw-r--r-- | networkx/readwrite/tests/test_pajek.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/networkx/readwrite/pajek.py b/networkx/readwrite/pajek.py index e23bf7c7..d8fdc055 100644 --- a/networkx/readwrite/pajek.py +++ b/networkx/readwrite/pajek.py @@ -176,7 +176,7 @@ def parse_pajek(lines): try: splitline=[x.decode('utf-8') for x in shlex.split(make_str(l).encode('utf-8'))] - except: + except AttributeError: splitline = shlex.split(str(l)) id,label=splitline[0:2] G.add_node(label) @@ -202,7 +202,7 @@ def parse_pajek(lines): try: splitline = [x.decode('utf-8') for x in shlex.split(make_str(l).encode('utf-8'))] - except: + except AttributeError: splitline = shlex.split(str(l)) if len(splitline)<2: diff --git a/networkx/readwrite/tests/test_pajek.py b/networkx/readwrite/tests/test_pajek.py index baac689c..70b2d0be 100644 --- a/networkx/readwrite/tests/test_pajek.py +++ b/networkx/readwrite/tests/test_pajek.py @@ -72,8 +72,6 @@ class TestPajek(object): nx.write_pajek(G,fh) fh.seek(0) H=nx.read_pajek(fh) - assert_equal(sorted(G.nodes()),sorted(H.nodes())) - assert_equal( - sorted(sorted(e) for e in G.edges()), - sorted(sorted(e) for e in H.edges())) + assert_nodes_equal(G.nodes(), H.nodes()) + assert_edges_equal(G.edges(), H.edges()) assert_equal(G.graph,H.graph) |