S3Boto3: Replace list_objects_v2 with list_objects in .listdir()

This restores compatibility with other services implementing the S3 protocol that do not yet support the new method. Closes #586
jschneier · Sep 6, 2018 · c383574 · c383574
1 parent 96d4268
commit c383574
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,9 +5,13 @@ django-storages CHANGELOG
 ******************
 
 - Fix off-by-1 error in ``get_available_name`` whenever ``file_overwrite`` or ``overwrite_files`` is ``True`` (`#588`_, `#589`_)
+- Change ``S3Boto3Storage.listdir()`` to use ``list_objects`` instead of ``list_objects_v2`` to restore
+  compatibility with services implementing the S3 protocol that do not yet support the new method (`#586`_, `#590`_)
 
 .. _#588: https://github.com/jschneier/django-storages/issues/588
 .. _#589: https://github.com/jschneier/django-storages/pull/589
+.. _#586: https://github.com/jschneier/django-storages/issues/586
+.. _#590: https://github.com/jschneier/django-storages/pull/590
 
 1.7 (2018-09-03)
 ****************

diff --git a/storages/backends/s3boto3.py b/storages/backends/s3boto3.py
@@ -543,7 +543,7 @@ def listdir(self, name):
 
         directories = []
         files = []
-        paginator = self.connection.meta.client.get_paginator('list_objects_v2')
+        paginator = self.connection.meta.client.get_paginator('list_objects')
         pages = paginator.paginate(Bucket=self.bucket_name, Delimiter='/', Prefix=path)
         for page in pages:
             for entry in page.get('CommonPrefixes', ()):