minor changes again

olologin · olologin · commit c9435c911b36 · 2016-10-19T07:25:50.000+03:00
diff --git a/sklearn/tree/_tree.pyx b/sklearn/tree/_tree.pyx
@@ -542,12 +542,11 @@ cdef class Tree:
         reaching node i.
     """
     # Wrap for outside world.
-    # WARNING: these reference the current `nodes` and `value` buffers, which
+    # WARNING: these copy 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:
         def __get__(self):
-            # it's small; copy for memory safety
             return sizet_ptr_to_ndarray(self.n_classes, self.n_outputs)
 
     property children_left:
diff --git a/sklearn/tree/_utils.pyx b/sklearn/tree/_utils.pyx
@@ -62,7 +62,7 @@ cdef inline UINT32_t our_rand_r(UINT32_t* seed) nogil:
 
 
 cdef inline np.ndarray sizet_ptr_to_ndarray(SIZE_t* data, SIZE_t size):
-    """Encapsulate data into a 1D numpy array of intp's."""
+    """Return copied data as 1D numpy array of intp's."""
     cdef np.npy_intp shape[1]
     shape[0] = <np.npy_intp> size
     return np.PyArray_SimpleNewFromData(1, shape, np.NPY_INTP, data).copy()
diff --git a/sklearn/tree/tests/test_tree.py b/sklearn/tree/tests/test_tree.py
@@ -1621,7 +1621,8 @@ def test_criterion_copy():
     n_outputs = 3
     n_classes = np.arange(3)
     n_samples = 100
-    for copy_func in [copy.copy, copy.deepcopy]:
+    pickle_copy = lambda obj: 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__()
