Skip to content

Fix decode_cf_variable, without tests #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion xray/conventions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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

Expand Down