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

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

index 264049912e3bb3fd1ffb34d4d6d4706974642fd1..60396834c43b172b9e725da1fcc12eb6ff163f77 100644

--- a/boto/s3/acl.py

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

@@ -44,7 +44,7 @@ class Policy:

elif g.type == 'Group':

u = g.uri

else:

- u = g.email

+ u = g.email_address

grants.append("%s = %s" % (u, g.permission))

return "<Policy: %s>" % ", ".join(grants)

@@ -87,8 +87,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):

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