summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Schult <dschult@colgate.edu>2015-09-14 10:36:12 -0400
committerDan Schult <dschult@colgate.edu>2015-09-14 10:36:12 -0400
commit2c796990abcfc2e2884813643f67a2e0c19dc7aa (patch)
tree02b47f78068077c9a6ffe350403e56dec14eca16
parentd24b13a58dc1ff84b46122e19711d07c4cdeebbd (diff)
downloadnetworkx-2c796990abcfc2e2884813643f67a2e0c19dc7aa.tar.gz
Make sure __all__ variables loaded in flow __init__.py
-rw-r--r--networkx/algorithms/flow/__init__.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/networkx/algorithms/flow/__init__.py b/networkx/algorithms/flow/__init__.py
index b8b9906f..9b12a5e7 100644
--- a/networkx/algorithms/flow/__init__.py
+++ b/networkx/algorithms/flow/__init__.py
@@ -1,12 +1,6 @@
-from .maxflow import *
-from .mincost import *
-from .edmondskarp import *
-from .preflowpush import *
-from .shortestaugmentingpath import *
-from .capacityscaling import *
-from .networksimplex import *
-from .utils import build_flow_dict, build_residual_network
-
+# this import is used to combine the __all__ varibles.
+from . import (maxflow, mincost, edmondskarp, preflowpush,
+ shortestaugmentingpath, capacityscaling, networksimplex)
__all__ = sum([maxflow.__all__,
mincost.__all__,
@@ -16,3 +10,12 @@ __all__ = sum([maxflow.__all__,
capacityscaling.__all__,
networksimplex.__all__,
], [])
+
+from .maxflow import *
+from .mincost import *
+from .edmondskarp import *
+from .preflowpush import *
+from .shortestaugmentingpath import *
+from .capacityscaling import *
+from .networksimplex import *
+from .utils import build_flow_dict, build_residual_network