Pull in upstream boto from github at bcb719937de9ac2851e632d62b777352029a6d55

tests/s3/mock_storage_service.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 107 matching lines @@
         return dst_bucket.copy_key(dst_key, self.bucket.name,
                                    self.name, metadata)
 
 
 class MockBucket(object):
 
     def __init__(self, connection=None, name=None, key_class=NOT_IMPL):
         self.name = name
         self.keys = {}
         self.acls = {name: MockAcl()}
+        # default object ACLs are one per bucket and not supported for keys
+        self.def_acl = MockAcl()
         self.subresources = {}
         self.connection = connection
         self.logging = False
 
     def copy_key(self, new_key_name, src_bucket_name,
                  src_key_name, metadata=NOT_IMPL, src_version_id=NOT_IMPL,
                  storage_class=NOT_IMPL, preserve_acl=NOT_IMPL):
         new_key = self.new_key(key_name=new_key_name)
         src_key = mock_connection.get_bucket(
             src_bucket_name).get_key(src_key_name)
         new_key.data = copy.copy(src_key.data)
         new_key.size = len(new_key.data)
         return new_key
 
     def disable_logging(self):
         self.logging = False
 
     def enable_logging(self, target_bucket_prefix):
         self.logging = True
 
     def get_acl(self, key_name='', headers=NOT_IMPL, version_id=NOT_IMPL):
         if key_name:
             # Return ACL for the key.
             return self.acls[key_name]
         else:
             # Return ACL for the bucket.
             return self.acls[self.name]
 
+    def get_def_acl(self, key_name=NOT_IMPL, headers=NOT_IMPL, 
+                    version_id=NOT_IMPL):
+        # Return default ACL for the bucket.
+        return self.def_acl
+
     def get_subresource(self, subresource, key_name=NOT_IMPL, headers=NOT_IMPL,
                         version_id=NOT_IMPL):
         if subresource in self.subresources:
             return self.subresources[subresource]
         else:
             return '<Subresource/>'
 
     def new_key(self, key_name=None):
         mock_key = MockKey(self, key_name)
         self.keys[key_name] = mock_key
@@ skipping 32 matching lines @@
                 version_id=NOT_IMPL):
         # We only handle setting ACL XML here; if you pass a canned ACL
         # the get_acl call will just return that string name.
         if key_name:
             # Set ACL for the key.
             self.acls[key_name] = acl_or_str
         else:
             # Set ACL for the bucket.
             self.acls[self.name] = acl_or_str
 
+    def set_def_acl(self, acl_or_str, key_name=NOT_IMPL, headers=NOT_IMPL,
+                    version_id=NOT_IMPL):
+        # We only handle setting ACL XML here; if you pass a canned ACL
+        # the get_acl call will just return that string name.
+        # Set default ACL for the bucket.
+        self.def_acl = acl_or_str
+
     def set_subresource(self, subresource, value, key_name=NOT_IMPL,
                         headers=NOT_IMPL, version_id=NOT_IMPL):
         self.subresources[subresource] = value
 
 
 class MockConnection(object):
 
     def __init__(self, aws_access_key_id=NOT_IMPL,
                  aws_secret_access_key=NOT_IMPL, is_secure=NOT_IMPL,
                  port=NOT_IMPL, proxy=NOT_IMPL, proxy_port=NOT_IMPL,
@@ skipping 86 matching lines @@
                        validate=NOT_IMPL, headers=NOT_IMPL,
                        version_id=NOT_IMPL):
         self.get_bucket().enable_logging(target_bucket)
 
     def equals(self, uri):
         return self.uri == uri.uri
 
     def get_acl(self, validate=NOT_IMPL, headers=NOT_IMPL, version_id=NOT_IMPL):
         return self.get_bucket().get_acl(self.object_name)
 
+    def get_def_acl(self, validate=NOT_IMPL, headers=NOT_IMPL, 
+                    version_id=NOT_IMPL):
+        return self.get_bucket().get_def_acl(self.object_name)
+
     def get_subresource(self, subresource, validate=NOT_IMPL, headers=NOT_IMPL,
                         version_id=NOT_IMPL):
         return self.get_bucket().get_subresource(subresource, self.object_name)
 
     def get_all_buckets(self, headers=NOT_IMPL):
         return self.connect().get_all_buckets()
 
     def get_all_keys(self, validate=NOT_IMPL, headers=NOT_IMPL):
         return self.get_bucket().get_all_keys(self)
 
@@ skipping 17 matching lines @@
         return self.object_name
 
     def new_key(self, validate=NOT_IMPL, headers=NOT_IMPL):
         bucket = self.get_bucket()
         return bucket.new_key(self.object_name)
 
     def set_acl(self, acl_or_str, key_name='', validate=NOT_IMPL,
                 headers=NOT_IMPL, version_id=NOT_IMPL):
         self.get_bucket().set_acl(acl_or_str, key_name)
 
+    def set_def_acl(self, acl_or_str, key_name=NOT_IMPL, validate=NOT_IMPL,
+                    headers=NOT_IMPL, version_id=NOT_IMPL):
+        self.get_bucket().set_def_acl(acl_or_str)
+
     def set_subresource(self, subresource, value, validate=NOT_IMPL,
                         headers=NOT_IMPL, version_id=NOT_IMPL):
         self.get_bucket().set_subresource(subresource, value, self.object_name)