summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordi Torrents <jordi.t21@gmail.com>2014-06-01 20:30:56 +0200
committerJordi Torrents <jordi.t21@gmail.com>2014-06-01 20:30:56 +0200
commit51218be985252f585b768a72e02f3750a51d17e3 (patch)
tree9d1c352fe2623529f1bb537515bad1916a3921c1
parent8b79e52df7d36988decd348f2a046550b1f093b6 (diff)
parenteec569debf28b9139fa96296f1cfdf79355b58df (diff)
downloadnetworkx-51218be985252f585b768a72e02f3750a51d17e3.tar.gz
Merge pull request #1189 from ysitu/stoerwagner
Rename stoer_wagner.py to stoerwagner.py
-rw-r--r--networkx/algorithms/connectivity/__init__.py12
-rw-r--r--networkx/algorithms/connectivity/stoerwagner.py (renamed from networkx/algorithms/connectivity/stoer_wagner.py)0
2 files changed, 5 insertions, 7 deletions
diff --git a/networkx/algorithms/connectivity/__init__.py b/networkx/algorithms/connectivity/__init__.py
index da95b1bf..f800eedb 100644
--- a/networkx/algorithms/connectivity/__init__.py
+++ b/networkx/algorithms/connectivity/__init__.py
@@ -1,14 +1,12 @@
"""Connectivity and cut algorithms
"""
-from . import connectivity, cuts, stoer_wagner, utils
+from .connectivity import *
+from .cuts import *
+from .stoerwagner import *
+from .utils import *
__all__ = sum([connectivity.__all__,
cuts.__all__,
- stoer_wagner.__all__,
+ stoerwagner.__all__,
utils.__all__,
], [])
-
-from .connectivity import *
-from .cuts import *
-from .stoer_wagner import *
-from .utils import *
diff --git a/networkx/algorithms/connectivity/stoer_wagner.py b/networkx/algorithms/connectivity/stoerwagner.py
index 50498a39..50498a39 100644
--- a/networkx/algorithms/connectivity/stoer_wagner.py
+++ b/networkx/algorithms/connectivity/stoerwagner.py