used azure.storage.Blob

Shikhar Goenka · Shikhar Goenka · commit 7f5c5a98bc16 · 2019-12-10T22:36:06.000Z
diff --git a/zarr/storage.py b/zarr/storage.py
@@ -2057,16 +2057,17 @@ def __contains__(self, key):
             return False
 
     def listdir(self, path=None):
+        from azure.storage.blob import Blob
         dir_path = normalize_storage_path(self._append_path_to_prefix(path))
         if dir_path:
             dir_path += '/'
         items = list()
         for blob in self.client.list_blobs(self.container, prefix=dir_path, delimiter='/'):
-            if '/' in blob.name[len(dir_path):]:
+            if type(blob) == Blob:
+                items.append(self._strip_prefix_from_path(blob.name, dir_path))
+            else:
                 items.append(self._strip_prefix_from_path(
                     blob.name[:blob.name.find('/', len(dir_path))], dir_path))
-            else:
-                items.append(self._strip_prefix_from_path(blob.name, dir_path))
         return items
 
     def rmdir(self, path=None):
@@ -2077,7 +2078,7 @@ def rmdir(self, path=None):
             self.client.delete_blob(self.container, blob.name)
 
     def getsize(self, path=None):
-        from azure.storage.blob.models import Blob
+        from azure.storage.blob import Blob
         store_path = normalize_storage_path(path)
         fs_path = self.prefix
         if store_path:
