Merge 4045ffa into 61f41d4

doc/source/reference/algorithms.connectivity.rst

@@ -16,7 +16,6 @@ Flow-based Connectivity
    node_connectivity
    local_edge_connectivity
    edge_connectivity
-   all_pairs_node_connectivity_matrix
 
 Flow-based Minimum Cuts
 -----------------------

networkx/algorithms/__init__.py

@@ -6,7 +6,6 @@
 from networkx.algorithms.clique import *
 from networkx.algorithms.community import *
 from networkx.algorithms.components import *
-from networkx.algorithms.connectivity import *
 from networkx.algorithms.core import *
 from networkx.algorithms.cycles import *
 from networkx.algorithms.dag import *
@@ -51,6 +50,12 @@
 import networkx.algorithms.operators
 import networkx.algorithms.tree 
 
-from networkx.algorithms.bipartite import projected_graph,project,is_bipartite
-from networkx.algorithms.isomorphism import (is_isomorphic,could_be_isomorphic,
+
+# bipartite
+from networkx.algorithms.bipartite import projected_graph, project, is_bipartite
+# connectivity
+from networkx.algorithms.connectivity import (minimum_edge_cut, minimum_node_cut,
+    average_node_connectivity, edge_connectivity, node_connectivity, stoer_wagner)
+# isomorphism
+from networkx.algorithms.isomorphism import (is_isomorphic, could_be_isomorphic,
     fast_could_be_isomorphic, faster_could_be_isomorphic)

networkx/algorithms/connectivity/__init__.py

@@ -1,5 +1,14 @@
 """Connectivity and cut algorithms
 """
-from networkx.algorithms.connectivity.connectivity import *
-from networkx.algorithms.connectivity.cuts import *
-from networkx.algorithms.connectivity.stoer_wagner import *
+from . import connectivity, cuts, stoer_wagner, utils
+
+__all__ = sum([connectivity.__all__,
+               cuts.__all__,
+               stoer_wagner.__all__,
+               utils.__all__,
+              ], [])
+
+from .connectivity import *
+from .cuts import *
+from .stoer_wagner import *
+from .utils import *