Skip to content

Commit 8d59f74

Browse files
committed
Merge pull request #710 from tkanmae/fix-to-netcdf
Fix #709
2 parents eb8d179 + cb0ba63 commit 8d59f74

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

xray/backends/netCDF4_.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ def _extract_nc4_encoding(variable, raise_on_invalid=False, lsd_okay=True,
155155
del encoding[k]
156156

157157
if raise_on_invalid:
158-
invalid = [k for enc in encoding for k in enc
159-
if k not in valid_encodings]
158+
invalid = [k for k in encoding if k not in valid_encodings]
160159
if invalid:
161160
raise ValueError('unexpected encoding parameters for %r backend: '
162161
' %r' % (backend, invalid))

xray/test/test_backends.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,13 @@ def test_open_encodings(self):
512512
if k in expected['time'].encoding)
513513
self.assertDictEqual(actual_encoding, expected['time'].encoding)
514514

515+
def test_dump_encodings(self):
516+
# regression test for #709
517+
ds = Dataset({'x': ('y', np.arange(10.0))})
518+
kwargs = dict(encoding={'x': {'zlib': True}})
519+
with self.roundtrip(ds, save_kwargs=kwargs) as actual:
520+
self.assertTrue(actual.x.encoding['zlib'])
521+
515522
def test_dump_and_open_encodings(self):
516523
# Create a netCDF file with explicit time units
517524
# and make sure it makes it into the encodings

0 commit comments

Comments
 (0)