review actions

Author: ocefpaf

xarray/coding/times.py

@@ -180,9 +180,6 @@ def decode_cf_timedelta(num_timedeltas, units):
     """Given an array of numeric timedeltas in netCDF format, convert it into a
     numpy timedelta64[ns] array.
     """
-    warnings.warn('Decoding timedeltas been deprecated and '
-                  'will be removed in xarray v??.',
-                  FutureWarning, stacklevel=2)
     num_timedeltas = np.asarray(num_timedeltas)
     units = _netcdf_to_numpy_timeunit(units)
 
@@ -365,12 +362,10 @@ def encode(self, variable, name=None):
             data, units = encode_cf_timedelta(
                 data, encoding.pop('units', None))
             safe_setitem(attrs, 'units', units, name=name)
+
         return Variable(dims, data, attrs, encoding)
 
     def decode(self, variable, name=None):
-        warnings.warn('Decoding timedeltas been deprecated and '
-                      'will be removed in xarray v??.',
-                      FutureWarning, stacklevel=2)
         dims, data, attrs, encoding = unpack_for_decoding(variable)
 
         if 'units' in attrs and attrs['units'] in TIME_UNITS:

xarray/conventions.py

@@ -294,12 +294,16 @@ def decode_cf_variable(name, var, concat_characters=True, mask_and_scale=True,
                       variables.CFScaleOffsetCoder()]:
             var = coder.decode(var, name=name)
 
-    enable_future_time_unit_decoding = OPTIONS['enable_future_time_unit_decoding']
+    enable_future_time_unit_decoding = OPTIONS[
+        'enable_future_time_unit_decoding']
     if decode_times:
         if enable_future_time_unit_decoding:
             coder = times.CFDatetimeCoder()
             var = coder.decode(var, name=name)
         else:
+            warnings.warn('Decoding timedeltas been deprecated and '
+                          'will be removed in xarray v011.',
+                          FutureWarning, stacklevel=2)
             for coder in [times.CFTimedeltaCoder(),
                           times.CFDatetimeCoder()]:
                 var = coder.decode(var, name=name)