diff options
| author | pierregm <pierregm@localhost> | 2008-06-20 00:18:32 +0000 |
|---|---|---|
| committer | pierregm <pierregm@localhost> | 2008-06-20 00:18:32 +0000 |
| commit | d2a19ae95c831d093cc5097e4643d2f9e813fe22 (patch) | |
| tree | be77625582c3600334ad6cd961fca7d2830a0ad8 | |
| parent | a5f0cf12e71fc65b7f4dab84df05ff7c4b7b2a3d (diff) | |
| download | numpy-d2a19ae95c831d093cc5097e4643d2f9e813fe22.tar.gz | |
* put maximum/minimum_fill_value back in __all__
| -rw-r--r-- | numpy/ma/core.py | 11 | ||||
| -rw-r--r-- | numpy/ma/mrecords.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index ce71254f1..64c49d5a1 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -44,7 +44,8 @@ __all__ = ['MAError', 'MaskType', 'MaskedArray', 'masked_less','masked_less_equal', 'masked_not_equal', 'masked_object','masked_outside', 'masked_print_option', 'masked_singleton','masked_values', 'masked_where', 'max', 'maximum', - 'mean', 'min', 'minimum', 'multiply', + 'maximum_fill_value', 'mean', 'min', 'minimum', 'minimum_fill_value', + 'multiply', 'negative', 'nomask', 'nonzero', 'not_equal', 'ones', 'outer', 'outerproduct', 'power', 'product', 'ptp', 'put', 'putmask', @@ -110,12 +111,12 @@ default_filler = {'b': True, 'V' : '???', } max_filler = ntypes._minvals -max_filler.update(dict([(k, -np.inf) for k in [np.float32, np.float64]])) +max_filler.update([(k, -np.inf) for k in [np.float32, np.float64]]) min_filler = ntypes._maxvals -min_filler.update(dict([(k, +np.inf) for k in [np.float32, np.float64]])) +min_filler.update([(k, +np.inf) for k in [np.float32, np.float64]]) if 'float128' in ntypes.typeDict: - max_filler[np.float128] = -np.inf - min_filler[np.float128] = +np.inf + max_filler.update([(np.float128, -np.inf)]) + min_filler.update([(np.float128, +np.inf)]) def default_fill_value(obj): diff --git a/numpy/ma/mrecords.py b/numpy/ma/mrecords.py index c7120404b..ba4b0f915 100644 --- a/numpy/ma/mrecords.py +++ b/numpy/ma/mrecords.py @@ -170,7 +170,7 @@ class MaskedRecords(MaskedArray, object): _locdict = self.__dict__ if _locdict['_baseclass'] == ndarray: _locdict['_baseclass'] = recarray - _locdict.update({'_mask':_mask, '_fieldmask':_mask}) + _locdict.update(_mask=_mask, _fieldmask=_mask) return def _getdata(self): |