diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-08-06 11:36:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 11:36:11 -0500 |
| commit | f307cec3962926558b6387ebb4ab8d3f4ea3aa34 (patch) | |
| tree | b902a845cb2b7a64f78aae7a10776c3daeb16e50 /numpy/matrixlib/defmatrix.py | |
| parent | d6539868b353e211b4aaa3a683101e094b3ee1df (diff) | |
| parent | 091b8c3b16d39d18f6921f9a17d06c1652b40dca (diff) | |
| download | numpy-f307cec3962926558b6387ebb4ab8d3f4ea3aa34.tar.gz | |
Merge pull request #9505 from eric-wieser/fix-issubdtype
BUG: issubdtype is inconsistent on types and dtypes
Diffstat (limited to 'numpy/matrixlib/defmatrix.py')
| -rw-r--r-- | numpy/matrixlib/defmatrix.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py index 2aed3ebde..e016b5f4c 100644 --- a/numpy/matrixlib/defmatrix.py +++ b/numpy/matrixlib/defmatrix.py @@ -137,7 +137,7 @@ def matrix_power(M, n): M = asanyarray(M) if M.ndim != 2 or M.shape[0] != M.shape[1]: raise ValueError("input must be a square array") - if not issubdtype(type(n), int): + if not issubdtype(type(n), N.integer): raise TypeError("exponent must be an integer") from numpy.linalg import inv |