remove zarr.compat (code changes)

Author: Joseph Hamman

bench/compress_normal.py

@@ -1,11 +1,14 @@
-import numpy as np
 import sys
-sys.path.insert(0, '..')
-import zarr
-import line_profiler
 import timeit
+
+import numpy as np
+
+import line_profiler
+import zarr
 from zarr import blosc
 
+sys.path.insert(0, '..')
+
 # setup
 a = np.random.normal(2000, 1000, size=200000000).astype('u2')
 z = zarr.empty_like(a, chunks=1000000, compression='blosc', compression_opts=dict(cname='lz4', clevel=5, shuffle=2))

docs/conf.py

@@ -14,8 +14,15 @@
 # serve to show the default.
 
 
-import sys
 import os
+import sys
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+import zarr
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -62,12 +69,6 @@
 copyright = '2018, Zarr Developers'
 author = 'Zarr Developers'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-import zarr
 version = zarr.__version__
 # The full version, including alpha/beta/rc tags.
 release = zarr.__version__

setup.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from setuptools import setup
 import sys
 
+from setuptools import setup
 
 DESCRIPTION = 'An implementation of chunked, compressed, ' \
               'N-dimensional arrays for Python.'

zarr/__init__.py

@@ -1,17 +1,19 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-from zarr.core import Array
-from zarr.creation import (empty, zeros, ones, full, array, empty_like, zeros_like,
-                           ones_like, full_like, open_array, open_like, create)
-from zarr.storage import (DictStore, MemoryStore, DirectoryStore, ZipStore, TempStore,
-                          NestedDirectoryStore, DBMStore, LMDBStore, SQLiteStore,
-                          LRUStoreCache, ABSStore, RedisStore, MongoDBStore)
-from zarr.hierarchy import group, open_group, Group
-from zarr.sync import ThreadSynchronizer, ProcessSynchronizer
 from zarr.codecs import *
-from zarr.convenience import (open, save, save_array, save_group, load, copy_store,
-                              copy, copy_all, tree, consolidate_metadata,
-                              open_consolidated)
+from zarr.convenience import (consolidate_metadata, copy, copy_all, copy_store,
+                              load, open, open_consolidated, save, save_array,
+                              save_group, tree)
+from zarr.core import Array
+from zarr.creation import (array, create, empty, empty_like, full, full_like,
+                           ones, ones_like, open_array, open_like, zeros,
+                           zeros_like)
+from zarr.errors import CopyError, MetadataError
+from zarr.hierarchy import Group, group, open_group
 from zarr.n5 import N5Store
-from zarr.errors import CopyError, MetadataError, PermissionError
+from zarr.storage import (ABSStore, DBMStore, DictStore, DirectoryStore,
+                          LMDBStore, LRUStoreCache, MemoryStore, MongoDBStore,
+                          NestedDirectoryStore, RedisStore, SQLiteStore,
+                          TempStore, ZipStore)
+from zarr.sync import ProcessSynchronizer, ThreadSynchronizer
 from zarr.version import version as __version__

zarr/attrs.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from zarr.compat import MutableMapping
-from zarr.errors import PermissionError
+from collections.abc import MutableMapping
+
 from zarr.meta import parse_metadata
 from zarr.util import json_dumps
 

zarr/compat.py

@@ -1,19 +1,20 @@
 # -*- coding: utf-8 -*-
 """Convenience functions for storing and loading data."""
 import io
-import re
 import itertools
-
+import re
+from collections.abc import Mapping
 
 from zarr.core import Array
-from zarr.creation import (open_array, normalize_store_arg,
-                           array as _create_array)
-from zarr.hierarchy import open_group, group as _create_group, Group
-from zarr.storage import contains_array, contains_group
-from zarr.errors import err_path_not_found, CopyError
-from zarr.util import normalize_storage_path, TreeViewer, buffer_size
-from zarr.compat import Mapping, text_type
+from zarr.creation import array as _create_array
+from zarr.creation import normalize_store_arg, open_array
+from zarr.errors import CopyError, err_path_not_found
+from zarr.hierarchy import Group
+from zarr.hierarchy import group as _create_group
+from zarr.hierarchy import open_group
 from zarr.meta import json_dumps, json_loads
+from zarr.storage import contains_array, contains_group
+from zarr.util import TreeViewer, buffer_size, normalize_storage_path
 
 
 # noinspection PyShadowingBuiltins

zarr/convenience.py

@@ -1,27 +1,28 @@
 # -*- coding: utf-8 -*-
 import binascii
-import operator
-import itertools
 import hashlib
+import itertools
+import operator
 import re
+from functools import reduce
 
 import numpy as np
 from numcodecs.compat import ensure_bytes, ensure_ndarray
 
-
-from zarr.util import (is_total_slice, human_readable_size, normalize_resize_args,
-                       normalize_storage_path, normalize_shape, normalize_chunks,
-                       InfoReporter, check_array_shape, nolock)
-from zarr.storage import array_meta_key, attrs_key, listdir, getsize
-from zarr.meta import decode_array_metadata, encode_array_metadata
 from zarr.attrs import Attributes
-from zarr.errors import err_read_only, err_array_not_found
-from zarr.compat import reduce
 from zarr.codecs import AsType, get_codec
-from zarr.indexing import (OIndex, OrthogonalIndexer, BasicIndexer, VIndex,
-                           CoordinateIndexer, MaskIndexer, check_fields, pop_fields,
-                           ensure_tuple, is_scalar, is_contiguous_selection,
-                           err_too_many_indices, check_no_multi_fields)
+from zarr.errors import err_array_not_found, err_read_only
+from zarr.indexing import (BasicIndexer, CoordinateIndexer, MaskIndexer,
+                           OIndex, OrthogonalIndexer, VIndex, check_fields,
+                           check_no_multi_fields, ensure_tuple,
+                           err_too_many_indices, is_contiguous_selection,
+                           is_scalar, pop_fields)
+from zarr.meta import decode_array_metadata, encode_array_metadata
+from zarr.storage import array_meta_key, attrs_key, getsize, listdir
+from zarr.util import (InfoReporter, check_array_shape, human_readable_size,
+                       is_total_slice, nolock, normalize_chunks,
+                       normalize_resize_args, normalize_shape,
+                       normalize_storage_path)
 
 
 # noinspection PyUnresolvedReferences

zarr/core.py

@@ -2,13 +2,15 @@
 from warnings import warn
 
 import numpy as np
+from numcodecs.registry import codec_registry
 
 from zarr.core import Array
-from zarr.storage import (DirectoryStore, init_array, contains_array, contains_group,
-                          default_compressor, normalize_storage_path, ZipStore)
+from zarr.errors import (err_array_not_found, err_contains_array,
+                         err_contains_group)
 from zarr.n5 import N5Store
-from numcodecs.registry import codec_registry
-from zarr.errors import err_contains_array, err_contains_group, err_array_not_found
+from zarr.storage import (DirectoryStore, ZipStore, contains_array,
+                          contains_group, default_compressor, init_array,
+                          normalize_storage_path)
 
 
 def create(shape, chunks=True, dtype=None, compressor='default',

zarr/creation.py

@@ -1,22 +1,22 @@
 # -*- coding: utf-8 -*-
+from collections.abc import MutableMapping
 from itertools import islice
 
 import numpy as np
 
-
-from zarr.compat import MutableMapping
 from zarr.attrs import Attributes
 from zarr.core import Array
-from zarr.storage import (contains_array, contains_group, init_group,
-                          MemoryStore, group_meta_key, attrs_key, listdir, rename, rmdir)
-from zarr.creation import (array, create, empty, zeros, ones, full,
-                           empty_like, zeros_like, ones_like, full_like,
-                           normalize_store_arg)
-from zarr.util import (normalize_storage_path, normalize_shape, InfoReporter, TreeViewer,
-                       is_valid_python_name, instance_dir, nolock)
-from zarr.errors import (err_contains_array, err_contains_group, err_group_not_found,
-                         err_read_only)
+from zarr.creation import (array, create, empty, empty_like, full, full_like,
+                           normalize_store_arg, ones, ones_like, zeros,
+                           zeros_like)
+from zarr.errors import (err_contains_array, err_contains_group,
+                         err_group_not_found, err_read_only)
 from zarr.meta import decode_group_metadata
+from zarr.storage import (MemoryStore, attrs_key, contains_array,
+                          contains_group, group_meta_key, init_group, listdir,
+                          rename, rmdir)
+from zarr.util import (InfoReporter, TreeViewer, is_valid_python_name, nolock,
+                       normalize_shape, normalize_storage_path)
 
 
 class Group(MutableMapping):