diff options
| author | Konstantinos Koukopoulos <koukopoulos@gmail.com> | 2014-08-26 17:44:51 +0300 |
|---|---|---|
| committer | Konstantinos Koukopoulos <koukopoulos@gmail.com> | 2014-08-26 17:44:51 +0300 |
| commit | a544fb7d53aa09489cf237ffdce76c595e2732ba (patch) | |
| tree | ce4da7e9c494d26cb7d9070e87cf9e650e63a441 | |
| parent | 73783292f1284ef56c9068f10d710d2786600117 (diff) | |
| download | boto-a544fb7d53aa09489cf237ffdce76c595e2732ba.tar.gz | |
remove forgotten pdb invocation.
| -rw-r--r-- | boto/s3/bucketlistresultset.py | 6 | ||||
| -rw-r--r-- | tests/integration/s3/test_bucket.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/boto/s3/bucketlistresultset.py b/boto/s3/bucketlistresultset.py index ab9c65e4..bab30586 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 +import urllib 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, six.text_type): + if isinstance(marker, unicode): marker = marker.encode('utf-8') - marker = urllib.parse.unquote(marker) + marker = urllib.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 3d464bd1..84951440 100644 --- a/tests/integration/s3/test_bucket.py +++ b/tests/integration/s3/test_bucket.py @@ -100,8 +100,6 @@ 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)) |