Pull in upstream boto from github at bcb719937de9ac2851e632d62b777352029a6d55

boto/storage_uri.py

 # Copyright 2010 Google Inc.
 # Copyright (c) 2011, Nexenta Systems 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 205 matching lines @@
         @type new_name: string
         @param new_name: new object name
         """
         if not self.bucket_name:
             raise InvalidUriError('clone_replace_name() on bucket-less URI %s' %
                                   self.uri)
         return BucketStorageUri(self.scheme, self.bucket_name, new_name,
                                 self.debug)
 
     def get_acl(self, validate=True, headers=None, version_id=None):
+        """returns a bucket's acl"""
         if not self.bucket_name:
             raise InvalidUriError('get_acl on bucket-less URI (%s)' % self.uri)
         bucket = self.get_bucket(validate, headers)
         # This works for both bucket- and object- level ACLs (former passes
         # key_name=None):
         acl = bucket.get_acl(self.object_name, headers, version_id)
         self.check_response(acl, 'acl', self.uri)
         return acl
 
+    def get_def_acl(self, validate=True, headers=None):
+        """returns a bucket's default object acl"""
+        if not self.bucket_name:
+            raise InvalidUriError('get_acl on bucket-less URI (%s)' % self.uri)
+        bucket = self.get_bucket(validate, headers)
+        # This works for both bucket- and object- level ACLs (former passes
+        # key_name=None):
+        acl = bucket.get_def_acl(self.object_name, headers)
+        self.check_response(acl, 'acl', self.uri)
+        return acl
+
     def get_location(self, validate=True, headers=None):
         if not self.bucket_name:
             raise InvalidUriError('get_location on bucket-less URI (%s)' %
                                   self.uri)
         bucket = self.get_bucket(validate, headers)
         return bucket.get_location()
 
     def get_subresource(self, subresource, validate=True, headers=None,
                         version_id=None):
         if not self.bucket_name:
@@ skipping 92 matching lines @@
         return conn.get_all_buckets(headers)
 
     def get_provider(self):
         conn = self.connect()
         provider = conn.provider
         self.check_response(provider, 'provider', self.uri)
         return provider
 
     def set_acl(self, acl_or_str, key_name='', validate=True, headers=None,
                 version_id=None):
+        """sets or updates a bucket's acl"""
         if not self.bucket_name:
             raise InvalidUriError('set_acl on bucket-less URI (%s)' %
                                   self.uri)
         self.get_bucket(validate, headers).set_acl(acl_or_str, key_name,
                                                    headers, version_id)
 
+    def set_def_acl(self, acl_or_str, key_name='', validate=True, headers=None,
+                version_id=None):
+        """sets or updates a bucket's default object acl"""
+        if not self.bucket_name:
+            raise InvalidUriError('set_acl on bucket-less URI (%s)' %
+                                  self.uri)
+        self.get_bucket(validate, headers).set_def_acl(acl_or_str, key_name,
+                                                   headers)
+
     def set_canned_acl(self, acl_str, validate=True, headers=None,
                        version_id=None):
+        """sets or updates a bucket's acl to a predefined (canned) value"""
         if not self.object_name:
             raise InvalidUriError('set_canned_acl on object-less URI (%s)' %
                                   self.uri)
         key = self.get_key(validate, headers)
         self.check_response(key, 'key', self.uri)
         key.set_canned_acl(acl_str, headers, version_id)
 
+    def set_def_canned_acl(self, acl_str, validate=True, headers=None,
+                       version_id=None):
+        """sets or updates a bucket's default object acl to a predefined 
+           (canned) value"""
+        if not self.object_name:
+            raise InvalidUriError('set_canned_acl on object-less URI (%s)' %
+                                  self.uri)
+        key = self.get_key(validate, headers)
+        self.check_response(key, 'key', self.uri)
+        key.set_def_canned_acl(acl_str, headers, version_id)
+
     def set_subresource(self, subresource, value, validate=True, headers=None,
                         version_id=None):
         if not self.bucket_name:
             raise InvalidUriError(
                 'set_subresource on bucket-less URI (%s)' % self.uri)
         bucket = self.get_bucket(validate, headers)
         bucket.set_subresource(subresource, value, self.object_name, headers,
                                version_id)
 
     def set_contents_from_string(self, s, headers=None, replace=True,
@@ skipping 80 matching lines @@
     def is_file_uri(self):
         return True
 
     def is_cloud_uri(self):
         return False
 
     def is_stream(self):
         """Retruns True if this URI represents input/output stream.
         """
         return self.stream