Changeset 1202

Show
Ignore:
Timestamp:
08/05/08 20:59:59 (4 months ago)
Author:
mattknox_ca
Message:

fix to preserve compatibility with numpy 1.1.x branch until numpy 1.2.x is released

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/timeseries/scikits/timeseries/tseries.py

    r1201 r1202  
    550550        # Fix the fill_value if we were accessing a field of a flexible array 
    551551        if isinstance(indx, basestring): 
    552             if self._fill_value is not None: 
    553                  newseries._fill_value = self._fill_value[indx] 
     552            _fv = self._fill_value 
     553            if _fv is not None and not np.isscalar(_fv): 
     554                 newseries._fill_value = _fv[indx] 
    554555            newseries._isfield = True 
    555556        # Fix the mask