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

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

similarity index 97%

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

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

index 648db79fcab9a34fc94fa53c740676c1be60b302..a7bca8c97c190e896ebaf0ab837add172ced3c89 100644

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

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

@@ -24,7 +24,8 @@ from boto.s3.user import User

CannedACLStrings = ['private', 'public-read',

'public-read-write', 'authenticated-read',

- 'bucket-owner-read', 'bucket-owner-full-control']

+ 'bucket-owner-read', 'bucket-owner-full-control',

+ 'log-delivery-write']

class Policy:

@@ -87,8 +88,8 @@ class ACL:

email_address=email_address)

self.grants.append(grant)

- def add_user_grant(self, permission, user_id):

- grant = Grant(permission=permission, type='CanonicalUser', id=user_id)

+ def add_user_grant(self, permission, user_id, display_name=None):

+ grant = Grant(permission=permission, type='CanonicalUser', id=user_id, display_name=display_name)

self.grants.append(grant)

def startElement(self, name, attrs, connection):