diff options
| author | Stefan van der Walt <stefan@sun.ac.za> | 2008-02-09 00:45:11 +0000 |
|---|---|---|
| committer | Stefan van der Walt <stefan@sun.ac.za> | 2008-02-09 00:45:11 +0000 |
| commit | fbc211df7a2ebd27efe45cf4f943e21f5ad9b104 (patch) | |
| tree | 9cea7049a873c0cd38bda75a5a5fe8d2d401b4fd /numpy/lib/arraysetops.py | |
| parent | a2df3f7818deaf51d08b8bd9095e05d1011b46a5 (diff) | |
| parent | d42ab1598a44cb00bffcc907605013eca012dbf9 (diff) | |
| download | numpy-fbc211df7a2ebd27efe45cf4f943e21f5ad9b104.tar.gz | |
Merge maskedarray branch up to r4776.
Diffstat (limited to 'numpy/lib/arraysetops.py')
| -rw-r--r-- | numpy/lib/arraysetops.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py index 1d99f7a97..f8304cced 100644 --- a/numpy/lib/arraysetops.py +++ b/numpy/lib/arraysetops.py @@ -207,7 +207,7 @@ def setmember1d( ar1, ar2 ): b1 = nm.zeros( ar1.shape, dtype = nm.int8 ) b2 = nm.ones( ar2.shape, dtype = nm.int8 ) tt = nm.concatenate( (b1, b2) ) - + # We need this to be a stable sort, so always use 'mergesort' here. The # values from the first array should always come before the values from the # second array. |