Pull in upstream boto from github at bcb719937de9ac2851e632d62b777352029a6d55

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 43 matching lines @@
         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 = ['Owner:%s' % self.owner.__repr__()]
+        else:
             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__())
         return '<%s>' % ', '.join(entries_repr)
 
     # Method with same signature as boto.s3.acl.ACL.add_email_grant(), to allow
     # polymorphic treatment at application layer.
     def add_email_grant(self, permission, email_address):
         entry = Entry(type=USER_BY_EMAIL, email_address=email_address,
@@ skipping 194 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