diff options
author | Konstantinos Koukopoulos <koukopoulos@gmail.com> | 2014-08-26 17:46:22 +0300 |
---|---|---|
committer | Konstantinos Koukopoulos <koukopoulos@gmail.com> | 2014-08-26 17:46:22 +0300 |
commit | d57f87eadef99617091a9bfa6845991eb7e22804 (patch) | |
tree | 3d7b85c15836f7d74c2f3533a477d4d094a6b55f | |
parent | a544fb7d53aa09489cf237ffdce76c595e2732ba (diff) | |
download | boto-d57f87eadef99617091a9bfa6845991eb7e22804.tar.gz |
Revert "remove forgotten pdb invocation."
This reverts commit a544fb7d53aa09489cf237ffdce76c595e2732ba.
-rw-r--r-- | boto/s3/bucketlistresultset.py | 6 | ||||
-rw-r--r-- | tests/integration/s3/test_bucket.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/boto/s3/bucketlistresultset.py b/boto/s3/bucketlistresultset.py index bab30586..ab9c65e4 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. -import urllib +from boto.compat import urllib, six def bucket_lister(bucket, prefix='', delimiter='', marker='', headers=None, encoding_type=None): @@ -37,9 +37,9 @@ 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, unicode): + if isinstance(marker, six.text_type): marker = marker.encode('utf-8') - marker = urllib.unquote(marker) + marker = urllib.parse.unquote(marker) more_results= rs.is_truncated class BucketListResultSet(object): diff --git a/tests/integration/s3/test_bucket.py b/tests/integration/s3/test_bucket.py index 84951440..3d464bd1 100644 --- a/tests/integration/s3/test_bucket.py +++ b/tests/integration/s3/test_bucket.py @@ -100,6 +100,8 @@ class S3BucketTest (unittest.TestCase): getall = lambda *a, **k: orig_getall(*a, max_keys=2, **k) with patch.object(self.bucket, '_get_all', getall): rs = self.bucket.list(encoding_type="url") + import pdb + pdb.set_trace() for element in rs: name = urllib.parse.unquote(element.name.encode('utf-8')) self.assertEqual(name, expected.pop(0)) |