Fix py3 s3 prefix decoding.

getmoto · Mar 16, 2017 · 446843e · 446843e
1 parent e25d149
commit 446843e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/moto/s3/responses.py b/moto/s3/responses.py
@@ -233,7 +233,7 @@ def _bucket_response_get(self, bucket_name, querystring, headers):
 
         bucket = self.backend.get_bucket(bucket_name)
         prefix = querystring.get('prefix', [None])[0]
-        if prefix:
+        if prefix and isinstance(prefix, six.binary_type):
             prefix = prefix.decode("utf-8")
         delimiter = querystring.get('delimiter', [None])[0]
         result_keys, result_folders = self.backend.prefix_query(
@@ -252,7 +252,7 @@ def _handle_list_objects_v2(self, bucket_name, querystring):
         bucket = self.backend.get_bucket(bucket_name)
 
         prefix = querystring.get('prefix', [None])[0]
-        if prefix:
+        if prefix and isinstance(prefix, six.binary_type):
             prefix = prefix.decode("utf-8")
         delimiter = querystring.get('delimiter', [None])[0]
         result_keys, result_folders = self.backend.prefix_query(
@@ -282,7 +282,7 @@ def _handle_list_objects_v2(self, bucket_name, querystring):
 
         return template.render(
             bucket=bucket,
-            prefix=prefix or b'',
+            prefix=prefix or '',
             delimiter=delimiter,
             result_keys=result_keys,
             result_folders=result_folders,