Fix S3 filtering by unicode prefix. Closes #838

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