From 446843e756093e3aa7d8140a7c409981caf33aea Mon Sep 17 00:00:00 2001 From: Steve Pulec Date: Wed, 15 Mar 2017 23:13:09 -0400 Subject: [PATCH] Fix py3 s3 prefix decoding. --- moto/s3/responses.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/moto/s3/responses.py b/moto/s3/responses.py index 954bf670..449fed0a 100644 --- a/moto/s3/responses.py +++ b/moto/s3/responses.py @@ -233,7 +233,7 @@ class ResponseObject(_TemplateEnvironmentMixin): 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 @@ class ResponseObject(_TemplateEnvironmentMixin): 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 @@ class ResponseObject(_TemplateEnvironmentMixin): return template.render( bucket=bucket, - prefix=prefix or b'', + prefix=prefix or '', delimiter=delimiter, result_keys=result_keys, result_folders=result_folders,