diff options
| author | Jack J. Woehr <jwoehr@softwoehr.com> | 2019-10-18 15:25:03 -0600 |
|---|---|---|
| committer | Jack J. Woehr <jwoehr@softwoehr.com> | 2019-10-18 15:25:03 -0600 |
| commit | cc3da40d52cb46a346bf429b8d76d7fd59e29887 (patch) | |
| tree | 3a0cf76b27723817e5520d877df1685ce7f4223d /numpy/matrixlib | |
| parent | 4d4cc4dcf4feaa6c3162b0d07b0f687e477724ad (diff) | |
| parent | c1f56c455252e4c2dd2535f0ce140125aff8ece2 (diff) | |
| download | numpy-cc3da40d52cb46a346bf429b8d76d7fd59e29887.tar.gz | |
Merge branch 'master' of https://github.com/numpy/numpy into einsum_c_buglet
Diffstat (limited to 'numpy/matrixlib')
| -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 3c7e8ffc2..cabd41367 100644 --- a/numpy/matrixlib/defmatrix.py +++ b/numpy/matrixlib/defmatrix.py @@ -1046,7 +1046,7 @@ def bmat(obj, ldict=None, gdict=None): referenced by name. ldict : dict, optional A dictionary that replaces local operands in current frame. - Ignored if `obj` is not a string or `gdict` is `None`. + Ignored if `obj` is not a string or `gdict` is None. gdict : dict, optional A dictionary that replaces global operands in current frame. Ignored if `obj` is not a string. |