Merge pull request zarr-developers#2 from mzjp2/abs_store

tjcrone · web-flow · commit e79cb4ffe66d · 2018-08-02T17:26:30.000-04:00
Quick fix for small bugs in ABSStore class in storage.py
diff --git a/zarr/storage.py b/zarr/storage.py
@@ -2026,7 +2026,7 @@ def dir_path(self, path=None):
         # prefix is normalized to not have a trailing slash
         dir_path = self.prefix
         if store_path:
-            dir_path = '/'.join(dir_path, store_path)
+            dir_path = os.path.join(dir_path, store_path)
         else:
             dir_path += '/'
         return dir_path
@@ -2040,13 +2040,13 @@ def rename(self, src_path, dst_path):
 
     def rmdir(self, path=None):
         dir_path = normalize_storage_path(self.full_path(path)) + '/'
-        for blob in self.client.list_blobs(self.container_name, dir_path):
+        for blob in self.client.list_blobs(self.container_name, prefix=dir_path):
             self.client.delete_blob(self.container_name, blob.name)
 
     def getsize(self, path=None):
         dir_path = self.dir_path(path)
         size = 0
-        for blob in self.client.list_blobs(prefix=dir_path):
+        for blob in self.client.list_blobs(self.container_name, prefix=dir_path):
             size += blob.properties.content_length # from https://stackoverflow.com/questions/47694592/get-container-sizes-in-azure-blob-storage-using-python
         return size
 
