Fix test_tree for x64 builds and flake

olologin · olologin · commit cdb613379357 · 2016-10-19T20:22:57.000+03:00
diff --git a/sklearn/tree/_tree.pyx b/sklearn/tree/_tree.pyx
@@ -542,7 +542,7 @@ cdef class Tree:
         reaching node i.
     """
     # Wrap for outside world.
-    # WARNING: these copy the current `nodes` and `value` buffers, which
+    # WARNING: these reference the current `nodes` and `value` buffers, which
     # must not be freed by a subsequent memory allocation.
     # (i.e. through `_resize` or `__setstate__`)
     property n_classes:
diff --git a/sklearn/tree/tests/test_tree.py b/sklearn/tree/tests/test_tree.py
@@ -1619,10 +1619,12 @@ def test_criterion_copy():
     # Let's check whether copy of our criterion has the same type
     # and properties as original
     n_outputs = 3
-    n_classes = np.arange(3)
+    n_classes = np.arange(3, dtype=np.intp)
     n_samples = 100
-    pickle_copy = lambda obj: pickle.loads(pickle.dumps(obj))
-    for copy_func in [copy.copy, copy.deepcopy, pickle_copy]:
+
+    def _pickle_copy(obj):
+        return pickle.loads(pickle.dumps(obj))
+    for copy_func in [copy.copy, copy.deepcopy, _pickle_copy]:
         for _, typename in CRITERIA_CLF.items():
             criteria = typename(n_outputs, n_classes)
             result = copy_func(criteria).__reduce__()
