Merging in latest boto.

boto/gs/acl.py

 # Copyright 2010 Google Inc.
 #
 # 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 24 matching lines @@
 ID = 'ID'
 NAME = 'Name'
 OWNER = 'Owner'
 PERMISSION = 'Permission'
 SCOPE = 'Scope'
 TYPE = 'type'
 USER_BY_EMAIL = 'UserByEmail'
 USER_BY_ID = 'UserById'
 
 
-CannedACLStrings = ['private', 'public-read',
+CannedACLStrings = ['private', 'public-read', 'project-private',
                     'public-read-write', 'authenticated-read',
                     'bucket-owner-read', 'bucket-owner-full-control']
 
 SupportedPermissions = ['READ', 'WRITE', 'FULL_CONTROL']
 
 class ACL:
 
     def __init__(self, parent=None):
         self.parent = parent
         self.entries = []
 
+    @property
+    def acl(self):
+        return self
+
     def __repr__(self):
         # Owner is optional in GS ACLs.
         if hasattr(self, 'owner'):
             entries_repr = ['']
         else:
             entries_repr = ['Owner:%s' % self.owner.__repr__()]
         acl_entries = self.entries
         if acl_entries:
             for e in acl_entries.entry_list:
                 entries_repr.append(e.__repr__())
@@ skipping 200 matching lines @@
               s += '<%s>%s</%s>' % (NAME, self.name, NAME)
         elif self.type == GROUP_BY_ID or self.type == USER_BY_ID:
             s += '<%s>%s</%s>' % (ID, self.id, ID)
             if self.name:
               s += '<%s>%s</%s>' % (NAME, self.name, NAME)
         else:
             raise InvalidAclError('Invalid scope type "%s" ', self.type)
 
         s += '</%s>' % SCOPE
         return s