andys suggestions and test

Author: jaquesgrobler

doc/modules/neighbors.rst

@@ -53,9 +53,9 @@ of each option, see `Nearest Neighbor Algorithms`_.
 
  .. warning::
 
- Regarding the Nearest Neighbors algorithms, if it is found that two
+ Regarding the Nearest Neighbors algorithms, if two
  neighbors, neighbor `k+1` and `k`, have identical distances but
- but different labels, the results will depend on the odering of the
+ but different labels, the results will depend on the ordering of the
  training data.
 
 .. _classification:

sklearn/neighbors/classification.py

@@ -18,7 +18,7 @@
  NeighborsBase, KNeighborsMixin,\
  RadiusNeighborsMixin, SupervisedIntegerMixin
 from ..base import ClassifierMixin
-from ..utils import atleast2d_or_csr
+from ..utils import atleast2d_or_csr, deprecated
 
 
 class KNeighborsClassifier(NeighborsBase, KNeighborsMixin,

sklearn/neighbors/regression.py

@@ -16,7 +16,8 @@
  NeighborsBase, KNeighborsMixin, \
  RadiusNeighborsMixin, SupervisedFloatMixin
 from ..base import RegressorMixin
-from ..utils import atleast2d_or_csr
+from ..utils import atleast2d_or_csr, deprecated
+
 
 
 class KNeighborsRegressor(NeighborsBase, KNeighborsMixin,

sklearn/neighbors/tests/test_neighbors.py

@@ -561,6 +561,16 @@ def test_neighbors_badargs():
  nbrs.radius_neighbors_graph,
  X, mode='blah')
 
+def test_neighbors_deprecation_arg():
+ """Test that passing the deprecated parameter will cause a
+ warning to be raised, as well as not crash the estimator."""
+ for cls in (neighbors.KNeighborsClassifier,
+ neighbors.KNeighborsRegressor):
+ with warnings.catch_warnings(record=True) as w:
+ warnings.simplefilter("always")
+ A = cls(warn_on_equidistant=True)
+ assert_equal(len(w), 1)
+
 
 if __name__ == '__main__':
  import nose