cloud-files 5.8.0__tar.gz → 5.8.1__tar.gz

{cloud_files-5.8.0 → cloud_files-5.8.1}/ChangeLog

@@ -1,6 +1,11 @@
 CHANGES
 =======
 
+5.8.1
+-----
+
+* fix(gcs ls): additional page prefixes were not populating (#119)
+
 5.8.0
 -----
 

{cloud_files-5.8.0 → cloud_files-5.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cloud-files
-Version: 5.8.0
+Version: 5.8.1
 Summary: Fast access to cloud storage and local FS.
 Home-page: https://github.com/seung-lab/cloud-files/
 Author: William Silversmith
@@ -54,6 +54,18 @@ Requires-Dist: intervaltree; extra == "monitoring"
 Requires-Dist: matplotlib; extra == "monitoring"
 Provides-Extra: apache
 Requires-Dist: lxml; extra == "apache"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![PyPI version](https://badge.fury.io/py/cloud-files.svg)](https://badge.fury.io/py/cloud-files) [![Test Suite](https://github.com/seung-lab/cloud-files/workflows/Test%20Suite/badge.svg)](https://github.com/seung-lab/cloud-files/actions?query=workflow%3A%22Test+Suite%22)
 

{cloud_files-5.8.0 → cloud_files-5.8.1}/cloud_files.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cloud-files
-Version: 5.8.0
+Version: 5.8.1
 Summary: Fast access to cloud storage and local FS.
 Home-page: https://github.com/seung-lab/cloud-files/
 Author: William Silversmith
@@ -54,6 +54,18 @@ Requires-Dist: intervaltree; extra == "monitoring"
 Requires-Dist: matplotlib; extra == "monitoring"
 Provides-Extra: apache
 Requires-Dist: lxml; extra == "apache"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![PyPI version](https://badge.fury.io/py/cloud-files.svg)](https://badge.fury.io/py/cloud-files) [![Test Suite](https://github.com/seung-lab/cloud-files/workflows/Test%20Suite/badge.svg)](https://github.com/seung-lab/cloud-files/actions?query=workflow%3A%22Test+Suite%22)
 

cloud_files-5.8.1/cloud_files.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "add0684", "is_release": true}

{cloud_files-5.8.0 → cloud_files-5.8.1}/cloudfiles/interfaces.py

@@ -798,6 +798,7 @@ class GoogleCloudStorageInterface(StorageInterface):
       except google.cloud.exceptions.NotFound:
         pass
 
+
   @retry
   def list_files(self, prefix, flat=False):
     """
@@ -817,33 +818,22 @@ class GoogleCloudStorageInterface(StorageInterface):
       delimiter=delimiter,
     )
 
-    first = True
-    for blob in blobs:
-      # This awkward construction is necessary
-      # because the request that populates prefixes 
-      # isn't made until the iterator is activated.
-      if first and blobs.prefixes:
+    for page in blobs.pages:
+      if page.prefixes:
         yield from (
           item.removeprefix(path)
-          for item in blobs.prefixes
+          for item in page.prefixes
         )
-        first = False
 
-      filename = blob.name.removeprefix(layer_path)
-      if not filename:
-        continue
-      elif not flat and filename[-1] != '/':
-        yield filename
-      elif flat and '/' not in blob.name.removeprefix(path):
-        yield filename
+      for blob in page:
+        filename = blob.name.removeprefix(layer_path)
+        if not filename:
+          continue
+        elif not flat and filename[-1] != '/':
+          yield filename
+        elif flat and '/' not in blob.name.removeprefix(path):
+          yield filename
 
-    # When there are no regular items at this level
-    # we need to still print the directories.
-    if first and blobs.prefixes:
-      yield from (
-        item.removeprefix(path)
-        for item in blobs.prefixes
-      )
 
   def release_connection(self):
     global GC_POOL

cloud_files-5.8.0/cloud_files.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "9e3fa7f", "is_release": true}