summaryrefslogtreecommitdiff
path: root/numpy/lib/arraysetops.py
diff options
context:
space:
mode:
authorMark Wiebe <mwiebe@enthought.com>2011-07-28 16:48:26 -0500
committerCharles Harris <charlesr.harris@gmail.com>2011-08-27 07:26:48 -0600
commit626949428752cc7d52e7f3fb3e8efbe97c3d9a21 (patch)
treecd574d5a2ac81fd75b926b323bc609bbdc54a45f /numpy/lib/arraysetops.py
parent69e0ed8c58a284ddfd305f2b1ff17cb8d04dd432 (diff)
downloadnumpy-626949428752cc7d52e7f3fb3e8efbe97c3d9a21.tar.gz
ENH: missingdata: Implemented boolean assignment, working with NA masks
Diffstat (limited to 'numpy/lib/arraysetops.py')
-rw-r--r--numpy/lib/arraysetops.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py
index 98597bc46..c4441d8a5 100644
--- a/numpy/lib/arraysetops.py
+++ b/numpy/lib/arraysetops.py
@@ -229,7 +229,7 @@ def intersect1d(ar1, ar2, assume_unique=False):
ar2 = unique(ar2)
aux = np.concatenate( (ar1, ar2) )
aux.sort()
- return aux[aux[1:] == aux[:-1]]
+ return aux[:-1][aux[1:] == aux[:-1]]
def setxor1d(ar1, ar2, assume_unique=False):
"""