simplify codecs config for dtypes

Author: alimanfoo

zarr/codecs.py

@@ -12,7 +12,6 @@
 
 
 from zarr.compat import text_type, binary_type
-from zarr.meta import encode_dtype, decode_dtype
 
 
 codec_registry = dict()
@@ -471,16 +470,10 @@ def decode(self, buf, out=None):
     def get_config(self):
         config = dict()
         config['id'] = self.codec_id
-        config['dtype'] = encode_dtype(self.dtype)
-        config['astype'] = encode_dtype(self.astype)
+        config['dtype'] = self.dtype.str
+        config['astype'] = self.astype.str
         return config
 
-    @classmethod
-    def from_config(cls, config):
-        dtype = decode_dtype(config['dtype'])
-        astype = decode_dtype(config['astype'])
-        return cls(dtype=dtype, astype=astype)
-
     def __repr__(self):
         r = '%s(dtype=%s' % (type(self).__name__, self.dtype)
         if self.astype != self.dtype:
@@ -595,21 +588,12 @@ def decode(self, buf, out=None):
     def get_config(self):
         config = dict()
         config['id'] = self.codec_id
-        config['astype'] = encode_dtype(self.astype)
-        config['dtype'] = encode_dtype(self.dtype)
+        config['astype'] = self.astype.str
+        config['dtype'] = self.dtype.str
         config['scale'] = self.scale
         config['offset'] = self.offset
         return config
 
-    @classmethod
-    def from_config(cls, config):
-        astype = decode_dtype(config['astype'])
-        dtype = decode_dtype(config['dtype'])
-        scale = config['scale']
-        offset = config['offset']
-        return cls(astype=astype, dtype=dtype, scale=scale,
-                   offset=offset)
-
     def __repr__(self):
         r = '%s(scale=%s, offset=%s, dtype=%s' % \
             (type(self).__name__, self.scale, self.offset, self.dtype)
@@ -702,17 +686,10 @@ def get_config(self):
         config = dict()
         config['id'] = self.codec_id
         config['digits'] = self.digits
-        config['dtype'] = encode_dtype(self.dtype)
-        config['astype'] = encode_dtype(self.astype)
+        config['dtype'] = self.dtype.str
+        config['astype'] = self.astype.str
         return config
 
-    @classmethod
-    def from_config(cls, config):
-        dtype = decode_dtype(config['dtype'])
-        astype = decode_dtype(config['astype'])
-        digits = config['digits']
-        return cls(digits=digits, dtype=dtype, astype=astype)
-
     def __repr__(self):
         r = '%s(digits=%s, dtype=%s' % \
             (type(self).__name__, self.digits, self.dtype)
@@ -806,10 +783,6 @@ def get_config(self):
         config['id'] = self.codec_id
         return config
 
-    @classmethod
-    def from_config(cls, config):
-        return cls()
-
     def __repr__(self):
         r = '%s()' % type(self).__name__
         return r
@@ -921,17 +894,10 @@ def get_config(self):
         config = dict()
         config['id'] = self.codec_id
         config['labels'] = [_ensure_text(l) for l in self.labels]
-        config['dtype'] = encode_dtype(self.dtype)
-        config['astype'] = encode_dtype(self.astype)
+        config['dtype'] = self.dtype.str
+        config['astype'] = self.astype.str
         return config
 
-    @classmethod
-    def from_config(cls, config):
-        dtype = decode_dtype(config['dtype'])
-        astype = decode_dtype(config['astype'])
-        labels = config['labels']
-        return cls(labels=labels, dtype=dtype, astype=astype)
-
     def __repr__(self):
         # make sure labels part is not too long
         labels = repr(self.labels[:3])

zarr/tests/test_core.py

@@ -505,12 +505,12 @@ def test_np_ufuncs(self):
 
         # use zarr array as indices or condition
         zc = self.create_array(shape=condition.shape, dtype=condition.dtype,
-                               chunks=10)
+                               chunks=10, filters=None)
         zc[:] = condition
         assert_array_equal(np.compress(condition, a, axis=0),
                            np.compress(zc, a, axis=0))
         zi = self.create_array(shape=indices.shape, dtype=indices.dtype,
-                               chunks=10)
+                               chunks=10, filters=None)
         zi[:] = indices
         assert_array_equal(np.take(a, indices, axis=1),
                            np.take(a, zi, axis=1))