finalize argument compatibility; coverage to 100%

Author: alimanfoo

docs/tutorial.rst

@@ -325,7 +325,7 @@ provided that all processes have access to a shared file system. E.g.::
     ...                     synchronizer=synchronizer)
     >>> z
     Array((10000, 10000), int32, chunks=(1000, 1000), order=C)
-      nbytes: 381.5M; nbytes_stored: 323; ratio: 1238390.1; initialized: 0/100
+      nbytes: 381.5M; nbytes_stored: 326; ratio: 1226993.9; initialized: 0/100
       compressor: Blosc(cname='lz4', clevel=5, shuffle=1)
       store: DirectoryStore; synchronizer: ProcessSynchronizer
 

tox.ini

@@ -12,7 +12,7 @@ setenv =
 commands =
     python setup.py build_ext --inplace
     py27: nosetests -v zarr
-    py34,py35: nosetests -v --with-coverage --cover-erase --cover-min-percentage=90 --cover-package=zarr --with-doctest --doctest-options=+NORMALIZE_WHITESPACE zarr
+    py34,py35: nosetests -v --with-coverage --cover-erase --cover-min-percentage=100 --cover-package=zarr --with-doctest --doctest-options=+NORMALIZE_WHITESPACE zarr
     py34,py35: python -m doctest -o NORMALIZE_WHITESPACE -o ELLIPSIS docs/tutorial.rst docs/spec/v2.rst
     py35: flake8 zarr
     python setup.py bdist_wheel

zarr/creation.py

@@ -116,7 +116,7 @@ def _handle_kwargs(compressor, fill_value, kwargs):
                 # assume single argument, e.g., int
                 compressor = codec_cls(compression_opts)
 
-        # be lenient here
+        # be lenient here if user gives compressor as 'compression'
         elif hasattr(compression, 'get_config'):
             compressor = compression
 

zarr/storage.py

@@ -247,16 +247,18 @@ def init_array(store, shape, chunks, dtype=None, compressor='default',
     chunks = normalize_chunks(chunks, shape, dtype.itemsize)
     order = normalize_order(order)
 
-    # normalize compressor
+    # obtain compressor config
     if compressor == 'none':
+        # compatibility
         compressor = None
     elif compressor == 'default':
         compressor = default_compressor
-    elif isinstance(compressor, str):
-        codec_cls = codec_registry[compressor]
-        compressor = codec_cls()
     if compressor:
-        compressor_config = compressor.get_config()
+        try:
+            compressor_config = compressor.get_config()
+        except AttributeError:
+            raise ValueError('bad compressor argument; expected Codec object, '
+                             'found %r' % compressor)
     else:
         compressor_config = None
 

zarr/tests/test_creation.py

@@ -309,6 +309,19 @@ def test_create():
     eq((10,), z.chunks)
     assert synchronizer is z.synchronizer
 
-    # allow string as compressor arg
-    z = create(100, chunks=10, compressor='zlib')
+    # don't allow string as compressor arg
+    with assert_raises(ValueError):
+        create(100, chunks=10, compressor='zlib')
+
+    # compatibility
+
+    z = create(100, compression='zlib', compression_opts=9)
     eq('zlib', z.compressor.codec_id)
+    eq(9, z.compressor.level)
+
+    z = create(100, compression='default')
+    eq('blosc', z.compressor.codec_id)
+
+    # errors
+    with assert_raises(ValueError):
+        create(100, compression=1)

zarr/tests/test_filters.py

@@ -59,8 +59,7 @@ def test_array_with_scaleoffset_filter():
     # setup
     astype = 'u1'
     dtype = 'f8'
-    flt = FixedScaleOffset(scale=10, offset=1000, astype=astype,
-                                 dtype=dtype)
+    flt = FixedScaleOffset(scale=10, offset=1000, astype=astype, dtype=dtype)
     filters = [flt]
     data = np.linspace(1000, 1001, 34, dtype='f8')