catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1499 from srikiraju/fix/s3-list-deleted

Browse source 
S3: Do not attempt to return deleted files in bucket listing
This commit is contained in:
Steve Pulec 2018-03-07 07:08:07 -05:00 • committed by GitHub
commit 0414cc51c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
moto/s3/models.py
View file

@ -722,6 +722,7 @@ class S3Backend(BaseBackend):
else:
key_results.add(key)
key_results = filter(lambda key: not isinstance(key, FakeDeleteMarker), key_results)
key_results = sorted(key_results, key=lambda key: key.name)
folder_results = [folder_name for folder_name in sorted(
folder_results, key=lambda key: key)]