diff options
| author | Ray Luo <rayluo@amazon.com> | 2016-01-14 17:08:27 -0800 |
|---|---|---|
| committer | Ray Luo <rayluo@amazon.com> | 2016-01-14 17:08:27 -0800 |
| commit | eeb7f237e0801bce9a87148c9364ba3069c6d6da (patch) | |
| tree | 21ae6b976856bf47f8444968effbefbee0496387 /boto/s3 | |
| parent | c2a17ce0e99dc66ff24f2943b3ca10eea6c004f0 (diff) | |
| parent | 16b9fbe6cb93e091b64fb90d9335d92e36891c03 (diff) | |
| download | boto-eeb7f237e0801bce9a87148c9364ba3069c6d6da.tar.gz | |
Merge pull request #3444 from rayluo/fix-s3-tests
Fix s3 tests
Diffstat (limited to 'boto/s3')
| -rw-r--r-- | boto/s3/bucketlistresultset.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/boto/s3/bucketlistresultset.py b/boto/s3/bucketlistresultset.py index ab9c65e4..e9044276 100644 --- a/boto/s3/bucketlistresultset.py +++ b/boto/s3/bucketlistresultset.py @@ -19,7 +19,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -from boto.compat import urllib, six +from boto.compat import unquote_str def bucket_lister(bucket, prefix='', delimiter='', marker='', headers=None, encoding_type=None): @@ -37,9 +37,7 @@ def bucket_lister(bucket, prefix='', delimiter='', marker='', headers=None, if k: marker = rs.next_marker or k.name if marker and encoding_type == "url": - if isinstance(marker, six.text_type): - marker = marker.encode('utf-8') - marker = urllib.parse.unquote(marker) + marker = unquote_str(marker) more_results= rs.is_truncated class BucketListResultSet(object): |