Merging in latest boto.

boto/s3/acl.py

 # Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
@@ skipping 26 matching lines @@
         grants = []
         for g in self.acl.grants:
             if g.id == self.owner.id:
                 grants.append("%s (owner) = %s" % (g.display_name, g.permission))
             else:
                 if g.type == 'CanonicalUser':
                     u = g.display_name
                 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)
 
     def startElement(self, name, attrs, connection):
         if name == 'Owner':
             self.owner = User(self)
             return self.owner
         elif name == 'AccessControlList':
             self.acl = ACL(self)
             return self.acl
@@ skipping 22 matching lines @@
         self.grants = []
 
     def add_grant(self, grant):
         self.grants.append(grant)
 
     def add_email_grant(self, permission, email_address):
         grant = Grant(permission=permission, type='AmazonCustomerByEmail',
                       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):
         if name == 'Grant':
             self.grants.append(Grant(self))
             return self.grants[-1]
         else:
             return None
 
     def endElement(self, name, value, connection):
@@ skipping 52 matching lines @@
         elif self.type == 'Group':
             s += '<URI>%s</URI>' % self.uri
         else:
             s += '<EmailAddress>%s</EmailAddress>' % self.email_address
         s += '</Grantee>'
         s += '<Permission>%s</Permission>' % self.permission
         s += '</Grant>'
         return s