Skip to content

Commit fc4489c

Browse files
authored
Merge pull request #497 from isidentical/cast-all-prefixes-to-empty-str
cast all non-truthy prefixes to an empty string
2 parents e47e7bf + 80ad1f7 commit fc4489c

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

s3fs/core.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,8 @@ async def _lsdir(
549549
self, path, refresh=False, max_items=None, delimiter="/", prefix=""
550550
):
551551
bucket, key, _ = self.split_path(path)
552+
if not prefix:
553+
prefix = ""
552554
if key:
553555
prefix = key.lstrip("/") + "/" + prefix
554556
if path not in self.dircache or refresh or not delimiter:

s3fs/tests/test_s3fs.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2140,6 +2140,9 @@ def test_find_with_prefix(s3):
21402140
assert test_1s == [test_bucket_name + "/prefixes/test_1"] + [
21412141
test_bucket_name + f"/prefixes/test_{cursor}" for cursor in range(10, 20)
21422142
]
2143+
assert s3.find(test_bucket_name + "/prefixes/") == s3.find(
2144+
test_bucket_name + "/prefixes/", prefix=None
2145+
)
21432146

21442147

21452148
def test_list_after_find(s3):

0 commit comments

Comments
 (0)