[med-svn] [python-mne] 346/376: FIX : fix scikit-learn renaming compat

[Yaroslav Halchenko]

This is an automated email from the git hooks/post-receive script.

yoh pushed a commit to annotated tag v0.1
in repository python-mne.

commit 63cf54c27fdb985268fb8a9819bdfe061289ec93
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Tue Sep 13 16:39:31 2011 -0400

    FIX : fix scikit-learn renaming compat
---
 mne/stats/cluster_level.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mne/stats/cluster_level.py b/mne/stats/cluster_level.py
index 63dc41a..a12e085 100644
--- a/mne/stats/cluster_level.py
+++ b/mne/stats/cluster_level.py
@@ -15,7 +15,11 @@ from ..parallel import parallel_func
 
 def _get_components(x_in, connectivity):
     """get connected components from a mask and a connectivity matrix"""
-    from scikits.learn.utils._csgraph import cs_graph_components
+    try:
+        from sklearn.utils._csgraph import cs_graph_components
+    except:
+        from scikits.learn.utils._csgraph import cs_graph_components
+
     mask = np.logical_and(x_in[connectivity.row], x_in[connectivity.col])
     data = connectivity.data[mask]
     row = connectivity.row[mask]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git