diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-01-06 11:47:17 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-01-06 11:47:17 -0700 |
| commit | 6c742bdfecdb0c6cebdce2be0ae189fb149cd82a (patch) | |
| tree | f0881529357f1c61957158001fd16883bba9917d /numpy/core/fromnumeric.py | |
| parent | 7d67348d3be1bb8193ca771f1004e8cab0361af7 (diff) | |
| parent | dbf3fcb19ec710732531c268aeba7aa348e872f1 (diff) | |
| download | numpy-6c742bdfecdb0c6cebdce2be0ae189fb149cd82a.tar.gz | |
Merge pull request #6950 from mhvk/trace-subclasses
BUG trace is not subclass aware, such that np.trace(ma) != ma.trace().
Diffstat (limited to 'numpy/core/fromnumeric.py')
| -rw-r--r-- | numpy/core/fromnumeric.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 362c29cb8..a2937c5c5 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -1367,7 +1367,11 @@ def trace(a, offset=0, axis1=0, axis2=1, dtype=None, out=None): (2, 3) """ - return asarray(a).trace(offset, axis1, axis2, dtype, out) + if isinstance(a, np.matrix): + # Get trace of matrix via an array to preserve backward compatibility. + return asarray(a).trace(offset, axis1, axis2, dtype, out) + else: + return asanyarray(a).trace(offset, axis1, axis2, dtype, out) def ravel(a, order='C'): |