From dffb5ecac0188baae98e87d7a926db22dd723960 Mon Sep 17 00:00:00 2001 From: Alex Kleeman Date: Thu, 12 Jun 2014 14:38:37 -0700 Subject: [PATCH] Fix decode_cf_variable, without tests --- xray/conventions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xray/conventions.py b/xray/conventions.py index 7ea7bd33765..3632d098934 100644 --- a/xray/conventions.py +++ b/xray/conventions.py @@ -414,6 +414,7 @@ def get_to(source, dest, k): def decode_cf_variable(var, concat_characters=True, mask_and_scale=True, decode_times=True): # use _data instead of data so as not to trigger loading data + var = xray.variable.as_variable(var) data = var._data dimensions = var.dimensions attributes = var.attrs.copy() @@ -433,7 +434,7 @@ def pop_to(source, dest, k): return v if 'dtype' in encoding: - if var.data.dtype != encoding['dtype']: + if data.dtype != encoding['dtype']: raise ValueError("Refused to overwrite dtype") encoding['dtype'] = data.dtype