BUG: Fix None comparison giving FutureWarning in choice function.

charris · charris · commit 275b1dd62f12 · 2014-07-31T19:07:38.000-06:00
This is in numpy/random/mtrand/mtrand.pyx where the choice function
was using comparisons of the form `None != p`.
diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx
@@ -1068,7 +1068,7 @@ cdef class RandomState:
             if pop_size is 0:
                 raise ValueError("a must be non-empty")
 
-        if None != p:
+        if p is not None:
             d = len(p)
             p = <ndarray>PyArray_ContiguousFromObject(p, NPY_DOUBLE, 1, 1)
             pix = <double*>PyArray_DATA(p)
@@ -1090,7 +1090,7 @@ cdef class RandomState:
 
         # Actual sampling
         if replace:
-            if None != p:
+            if p is not None:
                 cdf = p.cumsum()
                 cdf /= cdf[-1]
                 uniform_samples = self.random_sample(shape)
@@ -1103,7 +1103,7 @@ cdef class RandomState:
                 raise ValueError("Cannot take a larger sample than "
                                  "population when 'replace=False'")
 
-            if None != p:
+            if p is not None:
                 if np.count_nonzero(p > 0) < size:
                     raise ValueError("Fewer non-zero entries in p than size")
                 n_uniq = 0
