diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-03 16:02:33 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-03 16:02:33 -0700 |
| commit | ca77e31947b74feded3d69a282e638fa2e9ebf7c (patch) | |
| tree | 47abbe6403cee151a8439021e0574b4863612c28 /numpy/matrixlib/defmatrix.py | |
| parent | 961a28f828fd7075af1e548a294c1443fdf4a215 (diff) | |
| parent | 3830fcc99443cd479d4dd3fea5217c75396f9f3f (diff) | |
| download | numpy-ca77e31947b74feded3d69a282e638fa2e9ebf7c.tar.gz | |
Merge pull request #460 from endolith/regex_formatting
DOC: Formatting fixes using regex
Diffstat (limited to 'numpy/matrixlib/defmatrix.py')
| -rw-r--r-- | numpy/matrixlib/defmatrix.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py index cf47fadf8..4ecce483c 100644 --- a/numpy/matrixlib/defmatrix.py +++ b/numpy/matrixlib/defmatrix.py @@ -588,9 +588,9 @@ class matrix(N.ndarray): Parameters ---------- - axis: int, optional + axis : int, optional Axis along which logical OR is performed - out: ndarray, optional + out : ndarray, optional Output to existing array instead of creating new one, must have same shape as expected output |