third_party/gsutil/boto/boto/s3/bucketlistresultset.py - Issue 10199002: Upgrade gsutil to 3.4

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: third_party/gsutil/boto/boto/s3/bucketlistresultset.py

Issue 10199002: Upgrade gsutil to 3.4 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Addressed comments Created 8 years, 8 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: third_party/gsutil/boto/boto/s3/bucketlistresultset.py

diff --git a/third_party/gsutil/20110627/boto/boto/s3/bucketlistresultset.py b/third_party/gsutil/boto/boto/s3/bucketlistresultset.py

similarity index 97%

rename from third_party/gsutil/20110627/boto/boto/s3/bucketlistresultset.py

rename to third_party/gsutil/boto/boto/s3/bucketlistresultset.py

index 01236632bb9ef97c399beeb5d095f9fbc953d2b1..73b60c96392e3dd02e04ced3643b40a88c10eca6 100644

--- a/third_party/gsutil/20110627/boto/boto/s3/bucketlistresultset.py

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

@@ -31,7 +31,7 @@ def bucket_lister(bucket, prefix='', delimiter='', marker='', headers=None):

for k in rs:

yield k

if k:

- marker = k.name

+ marker = rs.next_marker or k.name

more_results= rs.is_truncated

class BucketListResultSet:

@@ -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