Merge pull request #469 from shoyer/fix-int32-encoding

Fixed a bug that could occur in serialization of 0-dimensional integer arrays

Author: shoyer

doc/whats-new.rst

@@ -45,6 +45,7 @@ Bug fixes
 - :py:func:`~xray.open_dataset` and :py:func:`~xray.open_mfdataset` support
   supplying chunks as a single integer.
 - Fixed a bug in serializing scalar datetime variable to netCDF.
+- Fixed a bug that could occur in serialization of 0-dimensional integer arrays.
 
 v0.5.1 (15 June 2015)
 ---------------------

xray/conventions.py

@@ -574,7 +574,7 @@ def maybe_encode_dtype(var):
         dtype = np.dtype(encoding.pop('dtype'))
         if dtype != var.dtype and dtype.kind != 'O':
             if np.issubdtype(dtype, int):
-                data = ops.around(data)
+                data = ops.around(data)[...]
             if dtype == 'S1' and data.dtype != 'S1':
                 data = string_to_char(np.asarray(data, 'S'))
                 dims = dims + ('string%s' % data.shape[-1],)

xray/test/test_conventions.py

@@ -456,6 +456,12 @@ def test_invalid_coordinates(self):
         actual = conventions.decode_cf(original)
         self.assertDatasetIdentical(original, actual)
 
+    def test_0d_int32_encoding(self):
+        original = Variable((), np.int32(0), encoding={'dtype': 'int64'})
+        expected = Variable((), np.int64(0))
+        actual = conventions.maybe_encode_dtype(original)
+        self.assertDatasetIdentical(expected, actual)
+
 
 class CFEncodedInMemoryStore(InMemoryDataStore):
     def store(self, variables, attributes):