diff options
| author | kyleknap <kyleknap@amazon.com> | 2014-10-08 12:41:04 -0700 |
|---|---|---|
| committer | kyleknap <kyleknap@amazon.com> | 2014-10-08 12:41:04 -0700 |
| commit | 2517f660f8ef9012708d46da3a36ab967993d2f6 (patch) | |
| tree | d90281aecdf962a2c7342938ac0a20d57fb74088 /boto/s3/bucketlistresultset.py | |
| parent | ff3d8159af3c816303785e023a4182aacb6aabf5 (diff) | |
| parent | 8f500ce75fea1ba1446195b26dddbe90b52223d8 (diff) | |
| download | boto-2.33.0.tar.gz | |
Merge branch 'release-2.33.0'2.33.0
Diffstat (limited to 'boto/s3/bucketlistresultset.py')
| -rw-r--r-- | boto/s3/bucketlistresultset.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/boto/s3/bucketlistresultset.py b/boto/s3/bucketlistresultset.py index f0bc0602..ab9c65e4 100644 --- a/boto/s3/bucketlistresultset.py +++ b/boto/s3/bucketlistresultset.py @@ -19,6 +19,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +from boto.compat import urllib, six + def bucket_lister(bucket, prefix='', delimiter='', marker='', headers=None, encoding_type=None): """ @@ -34,6 +36,10 @@ def bucket_lister(bucket, prefix='', delimiter='', marker='', headers=None, yield k 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) more_results= rs.is_truncated class BucketListResultSet(object): |