Revert "Merge pull request #28 from mrocklin/refactor-5"

This reverts commit 79b8f71, reversing
changes made to 4682c7d.

Author: alimanfoo

zarr/compressors.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, division
-
-import bz2
 import zlib
+import bz2
+
 
 import numpy as np
 
-from .compat import text_type
-from .util import ensure_bytes
+
+from zarr.compat import text_type
 
 
 registry = dict()
@@ -122,7 +122,7 @@ def normalize_opts(cls, compression_opts):
             cname = cname if cname is not None else cls.default_cname
 
             # check internal compressor is available
-            if blosc.compname_to_compcode(ensure_bytes(cname)) < 0:
+            if blosc.compname_to_compcode(cname) < 0:
                 raise ValueError('blosc internal compressor not available: %s'
                                  % cname)
 

zarr/util.py

@@ -187,10 +187,3 @@ def normalize_order(order):
     if order not in ['C', 'F']:
         raise ValueError("order must be either 'C' or 'F', found: %r" % order)
     return order
-
-
-def ensure_bytes(s):
-    if hasattr(s, 'encode'):
-        return s.encode()
-    else:
-        return s