summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraric <none@none>2007-01-22 16:46:39 +0000
committeraric <none@none>2007-01-22 16:46:39 +0000
commitf264f1fa6020ba04bc91aced4cc9de9ff87aa3ee (patch)
treed2b78d3f6905ef3bedd611b0901bc63c081cabf7
parent48bef2564355a75ba81158c0e00307e20060c820 (diff)
downloadnetworkx-f264f1fa6020ba04bc91aced4cc9de9ff87aa3ee.tar.gz
nx!=ny condition not checked and reported properly for adj matrix input
--HG-- extra : convert_revision : svn%3A3ed01bd8-26fb-0310-9e4c-ca1a4053419f/networkx/trunk%40516
-rw-r--r--networkx/convert.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/networkx/convert.py b/networkx/convert.py
index a1257e12..55541e21 100644
--- a/networkx/convert.py
+++ b/networkx/convert.py
@@ -276,9 +276,7 @@ def from_numpy_matrix(A,create_using=None):
nx,ny=A.shape
- try:
- nx==ny
- except:
+ if nx!=ny:
raise networkx.NetworkXError, \
"Adjacency matrix is not square. nx,ny=%s",A.shape