diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2023-05-13 11:02:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 11:02:49 -0600 |
| commit | 5187067d7ad176ee3614beab2b99a524dd719aa8 (patch) | |
| tree | 907997d0c294f550193322aaa73237c1a7bcfaa6 /numpy/matrixlib/defmatrix.py | |
| parent | b786189222ac5bf2f4efbb04399261f7f760bc18 (diff) | |
| parent | 81caed6e3c34c4bf4b22b4f6167e816ba2a3f73c (diff) | |
| download | numpy-5187067d7ad176ee3614beab2b99a524dd719aa8.tar.gz | |
Merge branch 'main' into deprecate-find-common-type
Diffstat (limited to 'numpy/matrixlib/defmatrix.py')
| -rw-r--r-- | numpy/matrixlib/defmatrix.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py index a414ee9bb..d029b13fb 100644 --- a/numpy/matrixlib/defmatrix.py +++ b/numpy/matrixlib/defmatrix.py @@ -3,9 +3,10 @@ __all__ = ['matrix', 'bmat', 'mat', 'asmatrix'] import sys import warnings import ast + +from .._utils import set_module import numpy.core.numeric as N from numpy.core.numeric import concatenate, isscalar -from numpy.core.overrides import set_module # While not in __all__, matrix_power used to be defined here, so we import # it for backward compatibility. from numpy.linalg import matrix_power |