boto/s3/bucketlistresultset.py - Issue 8386013: Merging in latest boto.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: boto/s3/bucketlistresultset.py

Issue 8386013: Merging in latest boto. (Closed) Base URL: svn://svn.chromium.org/boto

Patch Set: Redoing vendor drop by deleting and then merging. Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: boto/s3/bucketlistresultset.py

diff --git a/boto/s3/bucketlistresultset.py b/boto/s3/bucketlistresultset.py

index 01236632bb9ef97c399beeb5d095f9fbc953d2b1..14b0f5d6813009c01e51459b1519a66ec1757611 100644

--- a/boto/s3/bucketlistresultset.py

+++ b/boto/s3/bucketlistresultset.py

@@ -52,7 +52,8 @@ class BucketListResultSet:

def __iter__(self):

return bucket_lister(self.bucket, prefix=self.prefix,

- delimiter=self.delimiter, marker=self.marker, headers=self.headers)

+ delimiter=self.delimiter, marker=self.marker,

+ headers=self.headers)

def versioned_bucket_lister(bucket, prefix='', delimiter='',

key_marker='', version_id_marker='', headers=None):

@@ -64,7 +65,8 @@ def versioned_bucket_lister(bucket, prefix='', delimiter='',

while more_results:

rs = bucket.get_all_versions(prefix=prefix, key_marker=key_marker,

version_id_marker=version_id_marker,

- delimiter=delimiter, headers=headers)

+ delimiter=delimiter, headers=headers,

+ max_keys=999)

for k in rs:

yield k

key_marker = rs.next_key_marker

« no previous file with comments | « boto/s3/bucket.py ('k') | boto/s3/connection.py » ('j') | no next file with comments »