Merge 'zarr-developers/master' into 'jakirkham/use_numcodecs_0.6.2'

Author: jakirkham

docs/spec/v2.rst

@@ -253,7 +253,7 @@ keys like "foo/bar/0.0", "foo/bar/0.1", etc.
 To ensure consistent behaviour across different storage systems, logical paths
 MUST be normalized as follows:
 
-* Replace all backward slash characters ("\\") with forward slash characters
+* Replace all backward slash characters ("\\\\") with forward slash characters
   ("/")
 * Strip any leading "/" characters
 * Strip any trailing "/" characters

zarr/core.py

@@ -1929,7 +1929,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:
+        if type(checksum) is not str:  # pragma: py2 no cover
             checksum = checksum.decode('utf8')
 
         return checksum

zarr/storage.py

@@ -758,7 +758,7 @@ def __setitem__(self, key, value):
 
         finally:
             # clean up if temp file still exists for whatever reason
-            if temp_path is not None and os.path.exists(temp_path):
+            if temp_path is not None and os.path.exists(temp_path):  # pragma: no cover
                 os.remove(temp_path)
 
     def __delitem__(self, key):