Some Python 2.5 fixes.

Fabian Pedregosa · Fabian Pedregosa · commit e7f8212d012b · 2011-09-21T11:07:41.000+02:00
diff --git a/sklearn/cross_val.py b/sklearn/cross_val.py
@@ -2,4 +2,4 @@
 warnings.warn('sklearn.cross_val namespace is deprecated in version 0.9'
               ' and will be removed in version 0.11.'
               ' Please use sklearn.cross_validation instead.')
-from .cross_validation import *
+from cross_validation import *
diff --git a/sklearn/datasets/samples_generator.py b/sklearn/datasets/samples_generator.py
@@ -136,7 +136,7 @@ def make_classification(n_samples=100, n_features=20, n_informative=2,
     y = np.zeros(n_samples)
 
     # Build the polytope
-    from itertools import product
+    from ..utils.fixes import product
     C = np.array(list(product([-class_sep, class_sep], repeat=n_informative)))
 
     if not hypercube:
diff --git a/sklearn/neighbors/classification.py b/sklearn/neighbors/classification.py
@@ -232,8 +232,6 @@ def predict(self, X):
         return mode.flatten().astype(np.int)
 
 
-@deprecated("deprecated in v0.9; will be removed in v0.11; "
-            "use KNeighborsClassifier or RadiusNeighborsClassifier instead")
 class NeighborsClassifier(NeighborsBase, KNeighborsMixin,
                           RadiusNeighborsMixin, SupervisedIntegerMixin,
                           ClassifierMixin):
@@ -341,3 +339,9 @@ def predict(self, X):
             pred_labels = [self._y[ind] for ind in neigh_ind]
             return np.asarray([stats.mode(pi) for pi in pred_labels],
                               dtype=np.int)
+
+NeighborsClassifier = deprecated(
+    "deprecated in v0.9; will be removed in v0.11; "
+    "use KNeighborsClassifier or RadiusNeighborsClassifier instead")(
+    NeighborsClassifier)
+
