diff options
| author | Daniel G. Taylor <dan@programmer-art.org> | 2014-09-02 10:34:59 -0700 |
|---|---|---|
| committer | Daniel G. Taylor <dan@programmer-art.org> | 2014-09-02 10:34:59 -0700 |
| commit | 069d04b96226034bea96f9ee4c56ce985e9e3d2c (patch) | |
| tree | 01e40c4e8966f936099778735f4ef1704377ffa9 /boto | |
| parent | 3ba380f0e2098d7d475225e3b75deb3cb4b59384 (diff) | |
| parent | 258986e20a5143cdaab25ac1a9173f1648f97ac2 (diff) | |
| download | boto-069d04b96226034bea96f9ee4c56ce985e9e3d2c.tar.gz | |
Merge pull request #2559 from kouk/nonasciiqueryargs
Support non-ascii unicode strings in _get_all_query_args. Fixes: #2558, #2559.
Diffstat (limited to 'boto')
| -rw-r--r-- | boto/s3/bucket.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/boto/s3/bucket.py b/boto/s3/bucket.py index 34514078..504f24f9 100644 --- a/boto/s3/bucket.py +++ b/boto/s3/bucket.py @@ -377,7 +377,9 @@ class Bucket(object): key = 'max-keys' if not isinstance(value, six.string_types + (six.binary_type,)): value = six.text_type(value) - if value != '': + if not isinstance(value, six.binary_type): + value = value.encode('utf-8') + if value: pairs.append(u'%s=%s' % ( urllib.parse.quote(key), urllib.parse.quote(value) |