Merge pull request #6 from perimosocordiae/patch-1

robertlayton · robertlayton · commit 82bb6ca64dc5 · 2014-09-17T17:58:28.000+10:00
Fix merge conflict with scikit-learn/master
diff --git a/sklearn/neighbors/base.py b/sklearn/neighbors/base.py
@@ -293,8 +293,9 @@ class from an array representing our data set and ask who's
                                           squared=True)
             else:
                 dist = pairwise_distances(X, self._fit_X,
-                                          metric=self.effective_metric_,
+                                          self.effective_metric_,
                                           **self.effective_metric_kwds_)
+
             # XXX: should be implemented with a partial sort
             neigh_ind = dist.argsort(axis=1)
             neigh_ind = neigh_ind[:, :n_neighbors]
