summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraric <none@none>2006-11-21 15:33:27 +0000
committeraric <none@none>2006-11-21 15:33:27 +0000
commit857c8d3347353e16fc3c6b09bb922c0c625f14f8 (patch)
tree053f6f460463a0321e1cc819f2ef622a8bb970d7
parent45b42c651b1ffabb63c15234ecdeee7e67a18b0f (diff)
downloadnetworkx-857c8d3347353e16fc3c6b09bb922c0c625f14f8.tar.gz
adjust imports in tests to reflect refactoring of base.py and xbase.py
--HG-- extra : convert_revision : svn%3A3ed01bd8-26fb-0310-9e4c-ca1a4053419f/networkx/trunk%40466
-rw-r--r--networkx/tests/convert.txt3
-rw-r--r--networkx/tests/convert_numpy.txt4
-rw-r--r--networkx/tests/convert_scipy.txt11
-rw-r--r--networkx/tests/io.txt3
-rw-r--r--networkx/tests/io_yaml.txt3
5 files changed, 5 insertions, 19 deletions
diff --git a/networkx/tests/convert.txt b/networkx/tests/convert.txt
index 24dd5462..c51262c4 100644
--- a/networkx/tests/convert.txt
+++ b/networkx/tests/convert.txt
@@ -1,8 +1,7 @@
Convert
=======
->>> from networkx.base import Graph,DiGraph
->>> from networkx.xbase import XGraph,XDiGraph
+>>> from networkx import *
>>> from networkx.convert import *
>>> from networkx.operators import *
>>> from networkx.generators.classic import barbell_graph,cycle_graph
diff --git a/networkx/tests/convert_numpy.txt b/networkx/tests/convert_numpy.txt
index 02153473..b0333a55 100644
--- a/networkx/tests/convert_numpy.txt
+++ b/networkx/tests/convert_numpy.txt
@@ -1,9 +1,7 @@
Convert
=======
->>> from networkx.base import Graph,DiGraph
->>> from networkx.xbase import XGraph,XDiGraph
->>> from networkx.convert import *
+>>> from networkx import *
>>> from networkx.operators import *
>>> from networkx.generators.classic import barbell_graph,cycle_graph
>>> import numpy
diff --git a/networkx/tests/convert_scipy.txt b/networkx/tests/convert_scipy.txt
index 421c32e5..2c69653a 100644
--- a/networkx/tests/convert_scipy.txt
+++ b/networkx/tests/convert_scipy.txt
@@ -1,17 +1,8 @@
Convert
=======
->>> from networkx.base import Graph,DiGraph
->>> from networkx.xbase import XGraph,XDiGraph
->>> from networkx.convert import *
->>> from networkx.operators import *
>>> import os,tempfile
-
-Convert
-=======
-
->>> from networkx.base import Graph,DiGraph
->>> from networkx.xbase import XGraph,XDiGraph
+>>> from networkx import *
>>> from networkx.convert import *
>>> from networkx.operators import *
>>> from networkx.generators.classic import barbell_graph,cycle_graph
diff --git a/networkx/tests/io.txt b/networkx/tests/io.txt
index f283d337..3acae5e1 100644
--- a/networkx/tests/io.txt
+++ b/networkx/tests/io.txt
@@ -1,8 +1,7 @@
IO
==
->>> from networkx.base import Graph,DiGraph
->>> from networkx.xbase import XGraph,XDiGraph
+>>> from networkx import *
>>> from networkx.io import *
>>> from networkx.operators import *
>>> import os,tempfile
diff --git a/networkx/tests/io_yaml.txt b/networkx/tests/io_yaml.txt
index 66b600b5..56c37a99 100644
--- a/networkx/tests/io_yaml.txt
+++ b/networkx/tests/io_yaml.txt
@@ -1,5 +1,4 @@
->>> from networkx.base import Graph,DiGraph
->>> from networkx.xbase import XGraph,XDiGraph
+>>> from networkx import *
>>> from networkx.io import *
>>> from networkx.operators import *
>>> import os,tempfile