diff options
| author | njsmith <njs@pobox.com> | 2012-12-05 05:21:07 -0800 |
|---|---|---|
| committer | njsmith <njs@pobox.com> | 2012-12-05 05:21:07 -0800 |
| commit | 3f5862193a6085a4d59f4dde8d006670a24cae04 (patch) | |
| tree | 8fca3d00161c50dac04acceee91c70931ef6888a /numpy/lib | |
| parent | 023e559eda106cc48f82408a5958c7444d3769b2 (diff) | |
| parent | 46e3b4cc9d9101ceaafffc6bb8faafee1bdc5fc9 (diff) | |
| download | numpy-maintenance/1.6.x.tar.gz | |
Merge pull request #2787 from bfroehle/unique_argsortmaintenance/1.6.x
np.unique: TypeError: requested sort not available for type
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/arraysetops.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py index 47e94bc4d..721039238 100644 --- a/numpy/lib/arraysetops.py +++ b/numpy/lib/arraysetops.py @@ -112,8 +112,8 @@ def unique(ar, return_index=False, return_inverse=False): unique : ndarray The sorted unique values. unique_indices : ndarray, optional - The indices of the first occurrences of the unique values in the - (flattened) original array. Only provided if `return_index` is True. + The indices of the unique values in the (flattened) original array. + Only provided if `return_index` is True. unique_inverse : ndarray, optional The indices to reconstruct the (flattened) original array from the unique array. Only provided if `return_inverse` is True. @@ -174,10 +174,7 @@ def unique(ar, return_index=False, return_inverse=False): return ar if return_inverse or return_index: - if return_index: - perm = ar.argsort(kind='mergesort') - else: - perm = ar.argsort() + perm = ar.argsort() aux = ar[perm] flag = np.concatenate(([True], aux[1:] != aux[:-1])) if return_inverse: |