reverse order of decoding (CFDatetimeCoder before CFMaskCoder)

pydata · May 10, 2023 · 6c4454d · 6c4454d
1 parent 335b189
commit 6c4454d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/xarray/conventions.py b/xarray/conventions.py
@@ -263,6 +263,11 @@ def decode_cf_variable(
             var = strings.CharacterArrayCoder().decode(var, name=name)
         var = strings.EncodedStringCoder().decode(var)
 
+    if decode_timedelta:
+        var = times.CFTimedeltaCoder().decode(var, name=name)
+    if decode_times:
+        var = times.CFDatetimeCoder(use_cftime=use_cftime).decode(var, name=name)
+
     if mask_and_scale:
         for coder in [
             variables.UnsignedIntegerCoder(),
@@ -271,11 +276,6 @@ def decode_cf_variable(
         ]:
             var = coder.decode(var, name=name)
 
-    if decode_timedelta:
-        var = times.CFTimedeltaCoder().decode(var, name=name)
-    if decode_times:
-        var = times.CFDatetimeCoder(use_cftime=use_cftime).decode(var, name=name)
-
     if decode_endianness and not var.dtype.isnative:
         var = variables.EndianCoder().decode(var)
         original_dtype = var.dtype