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/ma | |
| 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/ma')
| -rw-r--r-- | numpy/ma/core.py | 7 | ||||
| -rw-r--r-- | numpy/ma/extras.py | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index 3299262d1..3c7206e1c 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -630,7 +630,6 @@ def getdata(a, subok=True): Examples -------- - >>> import numpy.ma as ma >>> a = ma.masked_equal([[1,2],[3,4]], 2) >>> a @@ -1263,7 +1262,6 @@ def getmask(a): Examples -------- - >>> import numpy.ma as ma >>> a = ma.masked_equal([[1,2],[3,4]], 2) >>> a @@ -1325,7 +1323,6 @@ def getmaskarray(arr): Examples -------- - >>> import numpy.ma as ma >>> a = ma.masked_equal([[1,2],[3,4]], 2) >>> a @@ -1533,7 +1530,7 @@ def make_mask_none(newshape, dtype=None): ---------- newshape : tuple A tuple indicating the shape of the mask. - dtype: {None, dtype}, optional + dtype : {None, dtype}, optional If None, use a MaskType instance. Otherwise, use a new datatype with the same fields as `dtype`, converted to boolean types. @@ -5653,7 +5650,7 @@ class mvoid(MaskedArray): Returns ------- - filled_void: + filled_void A `np.void` object See Also diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index 795e75402..a22152729 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -1296,7 +1296,7 @@ def cov(x, y=None, rowvar=True, bias=False, allow_masked=True, ddof=None): Raises ------ - ValueError: + ValueError Raised if some values are missing and `allow_masked` is False. See Also |