remove py2 compat (code changes)

Author: Joseph Hamman

setup.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
 from setuptools import setup
 import sys
 
@@ -17,11 +16,6 @@
     'numcodecs>=0.6.2',
 ]
 
-if sys.version_info < (3, 5):
-    dependencies.append('scandir')
-if sys.version_info < (3, 3) and sys.platform == "win32":
-    dependencies.append('pyosreplace')
-
 setup(
     name='zarr',
     description=DESCRIPTION,

zarr/__init__.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-from __future__ import absolute_import, print_function, division
-
-
 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)

zarr/attrs.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
-
-
 from zarr.compat import MutableMapping
 from zarr.errors import PermissionError
 from zarr.meta import parse_metadata

zarr/codecs.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-from __future__ import absolute_import, print_function, division
-
-
 from numcodecs import *
 from numcodecs.registry import codec_registry

zarr/compat.py

@@ -1,39 +1,14 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-from __future__ import absolute_import, print_function, division
-import sys
 
+# TODO: we can probably eliminate all of this module
+text_type = str
+binary_type = bytes
+from functools import reduce
+from itertools import zip_longest
 
-PY2 = sys.version_info[0] == 2
+def OrderedDict_move_to_end(od, key):
+    od.move_to_end(key)
 
-
-if PY2:  # pragma: py3 no cover
-
-    text_type = unicode
-    binary_type = str
-    reduce = reduce
-    from itertools import izip_longest as zip_longest
-
-    class PermissionError(Exception):
-        pass
-
-    def OrderedDict_move_to_end(od, key):
-        od[key] = od.pop(key)
-
-    from collections import Mapping, MutableMapping
-    from scandir import scandir
-
-
-else:  # pragma: py2 no cover
-
-    text_type = str
-    binary_type = bytes
-    from functools import reduce
-    from itertools import zip_longest
-    PermissionError = PermissionError
-
-    def OrderedDict_move_to_end(od, key):
-        od.move_to_end(key)
-
-    from collections.abc import Mapping, MutableMapping
-    from os import scandir
+from collections.abc import Mapping, MutableMapping
+from os import scandir

zarr/convenience.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 """Convenience functions for storing and loading data."""
-from __future__ import absolute_import, print_function, division
 import io
 import re
 import itertools
@@ -13,7 +12,7 @@
 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, PY2, text_type
+from zarr.compat import Mapping, text_type
 from zarr.meta import json_dumps, json_loads
 
 
@@ -451,9 +450,6 @@ def __exit__(self, *args):
     def __call__(self, *args, **kwargs):
         if self.log_file is not None:
             kwargs['file'] = self.log_file
-            if PY2:  # pragma: py3 no cover
-                # expect file opened in text mode, need to adapt message
-                args = [text_type(a) for a in args]
             print(*args, **kwargs)
             if hasattr(self.log_file, 'flush'):
                 # get immediate feedback

zarr/core.py

@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
 import binascii
 import operator
 import itertools
 import hashlib
 import re
 
-
 import numpy as np
 from numcodecs.compat import ensure_bytes, ensure_ndarray
 
@@ -17,7 +15,7 @@
 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 PermissionError, err_read_only, err_array_not_found
+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,
@@ -1786,7 +1784,7 @@ def _encode_chunk(self, chunk):
 
     def __repr__(self):
         t = type(self)
-        r = '<%s.%s' % (t.__module__, t.__name__)
+        r = '<{}.{}'.format(t.__module__, t.__name__)
         if self.name:
             r += ' %r' % self.name
         r += ' %s' % str(self.shape)
@@ -1827,11 +1825,11 @@ def info_items(self):
     def _info_items_nosync(self):
 
         def typestr(o):
-            return '%s.%s' % (type(o).__module__, type(o).__name__)
+            return '{}.{}'.format(type(o).__module__, type(o).__name__)
 
         def bytestr(n):
             if n > 2**10:
-                return '%s (%s)' % (n, human_readable_size(n))
+                return '{} ({})'.format(n, human_readable_size(n))
             else:
                 return str(n)
 
@@ -1872,7 +1870,7 @@ def bytestr(n):
                 ('Storage ratio', '%.1f' % (self.nbytes / self.nbytes_stored)),
             ]
         items += [
-            ('Chunks initialized', '%s/%s' % (self.nchunks_initialized, self.nchunks))
+            ('Chunks initialized', '{}/{}'.format(self.nchunks_initialized, self.nchunks))
         ]
 
         return items
@@ -1930,7 +1928,7 @@ def hexdigest(self, hashname="sha1"):
         checksum = binascii.hexlify(self.digest(hashname=hashname))
 
         # This is a bytes object on Python 3 and we want a str.
-        if type(checksum) is not str:  # pragma: py2 no cover
+        if type(checksum) is not str:
             checksum = checksum.decode('utf8')
 
         return checksum

zarr/creation.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
 from warnings import warn
 
-
 import numpy as np
 
-
 from zarr.core import Array
 from zarr.storage import (DirectoryStore, init_array, contains_array, contains_group,
                           default_compressor, normalize_storage_path, ZipStore)

zarr/errors.py

@@ -1,9 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
-
-
-from zarr.compat import PermissionError
-
 
 class MetadataError(Exception):
     pass

zarr/hierarchy.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
 from itertools import islice
 
 import numpy as np
 
 
-from zarr.compat import PY2, MutableMapping
+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,
@@ -218,7 +217,7 @@ def __len__(self):
 
     def __repr__(self):
         t = type(self)
-        r = '<%s.%s' % (t.__module__, t.__name__)
+        r = '<{}.{}'.format(t.__module__, t.__name__)
         if self.name:
             r += ' %r' % self.name
         if self._read_only:
@@ -229,7 +228,7 @@ def __repr__(self):
     def info_items(self):
 
         def typestr(o):
-            return '%s.%s' % (type(o).__module__, type(o).__name__)
+            return '{}.{}'.format(type(o).__module__, type(o).__name__)
 
         items = []
 
@@ -353,11 +352,8 @@ def __getattr__(self, item):
             raise AttributeError
 
     def __dir__(self):
-        if PY2:  # pragma: py3 no cover
-            base = instance_dir(self)
-        else:  # pragma: py2 no cover
-            # noinspection PyUnresolvedReferences
-            base = super().__dir__()
+        # noinspection PyUnresolvedReferences
+        base = super().__dir__()
         keys = sorted(set(base + list(self)))
         keys = [k for k in keys if is_valid_python_name(k)]
         return keys