Revert "Rename Path newtype to PathType"

This reverts commit 515951c.

Author: clbarnes

zarr/storage.py

@@ -20,6 +20,7 @@
 import multiprocessing
 import operator
 import os
+from pathlib import Path
 import re
 import shutil
 import sys
@@ -77,7 +78,7 @@
     default_compressor = Zlib()
 
 
-PathType = Union[str, bytes, None]
+Path = Union[str, bytes, None]
 
 
 def _path_to_prefix(path: Optional[str]) -> str:
@@ -89,15 +90,15 @@ def _path_to_prefix(path: Optional[str]) -> str:
     return prefix
 
 
-def contains_array(store: MutableMapping, path: PathType = None) -> bool:
+def contains_array(store: MutableMapping, path: Path = None) -> bool:
     """Return True if the store contains an array at the given logical path."""
     path = normalize_storage_path(path)
     prefix = _path_to_prefix(path)
     key = prefix + array_meta_key
     return key in store
 
 
-def contains_group(store: MutableMapping, path: PathType = None) -> bool:
+def contains_group(store: MutableMapping, path: Path = None) -> bool:
     """Return True if the store contains a group at the given logical path."""
     path = normalize_storage_path(path)
     prefix = _path_to_prefix(path)
@@ -113,7 +114,7 @@ def _rmdir_from_keys(store: MutableMapping, path: Optional[str] = None) -> None:
             del store[key]
 
 
-def rmdir(store, path: PathType = None):
+def rmdir(store, path: Path = None):
     """Remove all items under the given path. If `store` provides a `rmdir` method,
     this will be called, otherwise will fall back to implementation via the
     `MutableMapping` interface."""
@@ -136,7 +137,7 @@ def _rename_from_keys(store: MutableMapping, src_path: str, dst_path: str) -> No
             store[new_key] = store.pop(key)
 
 
-def rename(store, src_path: PathType, dst_path: PathType):
+def rename(store, src_path: Path, dst_path: Path):
     """Rename all items under the given path. If `store` provides a `rename` method,
     this will be called, otherwise will fall back to implementation via the
     `MutableMapping` interface."""
@@ -162,7 +163,7 @@ def _listdir_from_keys(store: MutableMapping, path: Optional[str] = None) -> Lis
     return sorted(children)
 
 
-def listdir(store, path: PathType = None):
+def listdir(store, path: Path = None):
     """Obtain a directory listing for the given path. If `store` provides a `listdir`
     method, this will be called, otherwise will fall back to implementation via the
     `MutableMapping` interface."""
@@ -175,7 +176,7 @@ def listdir(store, path: PathType = None):
         return _listdir_from_keys(store, path)
 
 
-def getsize(store, path: PathType = None) -> int:
+def getsize(store, path: Path = None) -> int:
     """Compute size of stored items for a given path. If `store` provides a `getsize`
     method, this will be called, otherwise will return -1."""
     path = normalize_storage_path(path)
@@ -233,7 +234,7 @@ def init_array(
     fill_value=None,
     order: str = "C",
     overwrite: bool = False,
-    path: PathType = None,
+    path: Path = None,
     chunk_store: MutableMapping = None,
     filters=None,
     object_codec=None,
@@ -458,7 +459,7 @@ def _init_array_metadata(
 def init_group(
     store: MutableMapping,
     overwrite: bool = False,
-    path: PathType = None,
+    path: Path = None,
     chunk_store: MutableMapping = None,
 ):
     """Initialize a group store. Note that this is a low-level function and there should be no
@@ -647,7 +648,7 @@ def __iter__(self):
     def __len__(self) -> int:
         return sum(1 for _ in self.keys())
 
-    def listdir(self, path: PathType = None) -> List[str]:
+    def listdir(self, path: Path = None) -> List[str]:
         path = normalize_storage_path(path)
         if path:
             try:
@@ -662,7 +663,7 @@ def listdir(self, path: PathType = None) -> List[str]:
         else:
             return []
 
-    def rename(self, src_path: PathType, dst_path: PathType):
+    def rename(self, src_path: Path, dst_path: Path):
         src_path = normalize_storage_path(src_path)
         dst_path = normalize_storage_path(dst_path)
 
@@ -671,7 +672,7 @@ def rename(self, src_path: PathType, dst_path: PathType):
 
         dst_parent[dst_key] = src_parent.pop(src_key)
 
-    def rmdir(self, path: PathType = None):
+    def rmdir(self, path: Path = None):
         path = normalize_storage_path(path)
         if path:
             try:
@@ -686,7 +687,7 @@ def rmdir(self, path: PathType = None):
             # clear out root
             self.root = self.cls()
 
-    def getsize(self, path: PathType = None):
+    def getsize(self, path: Path = None):
         path = normalize_storage_path(path)
 
         # obtain value to return size of