improve error message when attempting to convert a multigraph,

X*Graph(multiedges=True), to an adjacency matrix representation

--HG--
extra : convert_revision : svn%3A3ed01bd8-26fb-0310-9e4c-ca1a4053419f/networkx/trunk%40494

1 files changed, 4 insertions, 4 deletions

diff --git a/networkx/convert.py b/networkx/convert.py
index b99fb8c5..f45317f4 100644
--- a/networkx/convert.py
+++ b/networkx/convert.py
@@ -235,8 +235,8 @@ def to_numpy_matrix(G,nodelist=None):
 
     if hasattr(G,"multiedges"):
         if G.multiedges==True:
-            raise ImportError, \
-                  "Not allowed with for graphs with multiedges."
+            raise TypeError, \
+                  "Conversion to numpy_matrix not allowed with for graphs with multiedges."
 
     if nodelist is None:
         nodelist=G.nodes()
@@ -337,8 +337,8 @@ def to_scipy_sparse_matrix(G,nodelist=None):
 
     if hasattr(G,"multiedges"):
         if G.multiedges==True:
-            raise ImportError, \
-                  "Not allowed with for graphs with multiedges."
+            raise TypeError, \
+                  "Conversion to scipy_sparse_matrix not allowed with for graphs with multiedges."
 
     if nodelist is None:
         nodelist=G.nodes()