persidict 0.32.2__py3-none-any.whl → 0.32.3__py3-none-any.whl

persidict/s3_dict.py

@@ -253,16 +253,18 @@ class S3Dict(PersiDict):
         num_files = 0
         suffix = "." + self.file_type
 
-        paginator = self.s3_client.get_paginator("list_objects")
+        paginator = self.s3_client.get_paginator("list_objects_v2")
         page_iterator = paginator.paginate(
             Bucket=self.bucket_name, Prefix = self.root_prefix)
 
         for page in page_iterator:
-            if "Contents" in page:
-                for key in page["Contents"]:
-                    obj_name = key["Key"]
-                    if obj_name.endswith(suffix):
-                        num_files += 1
+            contents = page.get("Contents")
+            if not contents:
+                continue
+            for key in contents:
+                obj_name = key["Key"]
+                if obj_name.endswith(suffix):
+                    num_files += 1
 
         return num_files
 
@@ -280,25 +282,27 @@ class S3Dict(PersiDict):
             return SafeStrTuple(result)
 
         def step():
-            paginator = self.s3_client.get_paginator("list_objects")
+            paginator = self.s3_client.get_paginator("list_objects_v2")
             page_iterator = paginator.paginate(
                 Bucket=self.bucket_name, Prefix = self.root_prefix)
 
             for page in page_iterator:
-                if "Contents" in page:
-                    for key in page["Contents"]:
-                        obj_name = key["Key"]
-                        if not obj_name.endswith(suffix):
-                            continue
-                        obj_key = splitter(obj_name)
-                        if iter_type == "keys":
-                            yield unsign_safe_str_tuple(
-                                obj_key, self.digest_len)
-                        elif iter_type == "values":
-                            yield self[obj_key]
-                        else:
-                            yield (unsign_safe_str_tuple(
-                                obj_key, self.digest_len), self[obj_key])
+                contents = page.get("Contents")
+                if not contents:
+                    continue
+                for key in contents:
+                    obj_name = key["Key"]
+                    if not obj_name.endswith(suffix):
+                        continue
+                    obj_key = splitter(obj_name)
+                    if iter_type == "keys":
+                        yield unsign_safe_str_tuple(
+                            obj_key, self.digest_len)
+                    elif iter_type == "values":
+                        yield self[obj_key]
+                    else:
+                        yield (unsign_safe_str_tuple(
+                            obj_key, self.digest_len), self[obj_key])
 
         return step()
 

{persidict-0.32.2.dist-info → persidict-0.32.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: persidict
-Version: 0.32.2
+Version: 0.32.3
 Summary: Simple persistent key-value store for Python. Values are stored as files on a disk or as S3 objects on AWS cloud.
 Keywords: persistence,dicts,distributed,parallel
 Author: Vlad (Volodymyr) Pavlov

persidict-0.32.3.dist-info/RECORD

@@ -0,0 +1,13 @@
+persidict/__init__.py,sha256=CDOSJGgCnyRTkGUTzaeg3Cqsxwx0-0EFieOtldXwAls,1380
+persidict/file_dir_dict.py,sha256=DGULotXBerZepd1SR1RPaMd-MCewIodrGOoZreUdeKY,17527
+persidict/jokers.py,sha256=kX4bE-jKWTM2ki7JOmm_2uJS8zm8u6InZ_V12xo2ImI,1436
+persidict/overlapping_multi_dict.py,sha256=a-lUbmY15_HrDq6jSIt8F8tJboqbeYiuRQeW4elf_oU,2663
+persidict/persi_dict.py,sha256=5PliQ331DgQi1YBXqyNEaAKpFtRq_WPmnJ_pGW8S9-g,12900
+persidict/s3_dict.py,sha256=OCCVawtmCJM79K4xTvmbn6U2oZt49JZ-1MBoMx7o9m0,12348
+persidict/safe_chars.py,sha256=WaIOliBdLlZ12CepEa1C3b1VPxvX4s2hvnZanCxM6BQ,565
+persidict/safe_str_tuple.py,sha256=cTk5BL3r-yE62EKf7VngTaUpZAdsATJPIjiCGqQzkyU,3717
+persidict/safe_str_tuple_signing.py,sha256=5uCjAVZRqOou-KpDZw-Exboc3-3vuayJMqrrt8aZ0ck,3742
+persidict/write_once_dict.py,sha256=dqzA3amVDK9D8ygU8NFT5B87smAHYWdEn78Fssj6s_g,6396
+persidict-0.32.3.dist-info/WHEEL,sha256=4n27za1eEkOnA7dNjN6C5-O2rUiw6iapszm14Uj-Qmk,79
+persidict-0.32.3.dist-info/METADATA,sha256=5JSZ2ZGCbIndTyyIh0265V9A6S0hEMpm0Yn5erhzHuk,9334
+persidict-0.32.3.dist-info/RECORD,,

{persidict-0.32.2.dist-info → persidict-0.32.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.7.19
+Generator: uv 0.8.13
 Root-Is-Purelib: true
 Tag: py3-none-any

persidict-0.32.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-persidict/__init__.py,sha256=0833922468029f2453906513cda7a0dc2aacc70c74fb410589e3ad95d5f0025b,1380
-persidict/file_dir_dict.py,sha256=0c650ba2d5c17ab65ea5dd5247544f68c77e3027b022876b18ea19ade51d78a6,17527
-persidict/jokers.py,sha256=917e1b13e8ca593336922ec93a69bfdae252f339bcbba22767f575db1a362262,1436
-persidict/overlapping_multi_dict.py,sha256=6be9546e6635e7f1eb0eaea3488b7c17cb496e8a9b7988ae450796e1e95ffe85,2663
-persidict/persi_dict.py,sha256=e4f962437df50e0422d58057ab23446802a916d46afd63e69c9fe9196f12f7e8,12900
-persidict/s3_dict.py,sha256=0d8942037cee409d8bda8f63f923a8385f4f9f1fac03e765ec5f5fc675334ae2,12292
-persidict/safe_chars.py,sha256=59a20e96205d2e5675d827a911ad42ddbd553f1bd7e2cda1be765a9c2c4ce814,565
-persidict/safe_str_tuple.py,sha256=71393904bdebfb213ad8429fed59e04da52964076c01324f2238821aa4339325,3717
-persidict/safe_str_tuple_signing.py,sha256=e6e0a3015651a8ea2ef8aa43670f84c5ba1cdfedefb9ac8932aaebb7c699d1c9,3742
-persidict/write_once_dict.py,sha256=76acc0dda9950caf43f32814f0d153e41f3bb260076167449fbf05b2c8fab3f8,6396
-persidict-0.32.2.dist-info/WHEEL,sha256=607c46fee47e440c91332c738096ff0f5e54ca3b0818ee85462dd5172a38e793,79
-persidict-0.32.2.dist-info/METADATA,sha256=54072df5d3f92135b1ff868e96bf0de7a406185f243090b3725c0b5d46acf736,9334
-persidict-0.32.2.dist-info/RECORD,,