Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix py3 s3 prefix decoding.

Browse Source
This commit is contained in:
Steve Pulec 2017-03-15 23:13:09 -04:00
parent e25d1499c2
commit 446843e756
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/s3/responses.py
View File

@ -233,7 +233,7 @@ class ResponseObject(_TemplateEnvironmentMixin):
bucket = self.backend.get_bucket(bucket_name) bucket = self.backend.get_bucket(bucket_name)
prefix = querystring.get('prefix', [None])[0] prefix = querystring.get('prefix', [None])[0]
if prefix: if prefix and isinstance(prefix, six.binary_type):
prefix = prefix.decode("utf-8") prefix = prefix.decode("utf-8")
delimiter = querystring.get('delimiter', [None])[0] delimiter = querystring.get('delimiter', [None])[0]
result_keys, result_folders = self.backend.prefix_query( result_keys, result_folders = self.backend.prefix_query(
@ -252,7 +252,7 @@ class ResponseObject(_TemplateEnvironmentMixin):
bucket = self.backend.get_bucket(bucket_name) bucket = self.backend.get_bucket(bucket_name)
prefix = querystring.get('prefix', [None])[0] prefix = querystring.get('prefix', [None])[0]
if prefix: if prefix and isinstance(prefix, six.binary_type):
prefix = prefix.decode("utf-8") prefix = prefix.decode("utf-8")
delimiter = querystring.get('delimiter', [None])[0] delimiter = querystring.get('delimiter', [None])[0]
result_keys, result_folders = self.backend.prefix_query( result_keys, result_folders = self.backend.prefix_query(
@ -282,7 +282,7 @@ class ResponseObject(_TemplateEnvironmentMixin):
return template.render( return template.render(
bucket=bucket, bucket=bucket,
prefix=prefix or b'', prefix=prefix or '',
delimiter=delimiter, delimiter=delimiter,
result_keys=result_keys, result_keys=result_keys,
result_folders=result_folders, result_folders=result_folders,