Rename file setquota to file containerlimit set

[kamaki] / kamaki / clients / pithos / rest_api.py

diff --git a/kamaki/clients/pithos/rest_api.py b/kamaki/clients/pithos/rest_api.py
index b7028ee..9cbf75e 100644 (file)
--- a/kamaki/clients/pithos/rest_api.py
+++ b/kamaki/clients/pithos/rest_api.py
@@ -495,7 +495,7 @@ class PithosRestClient(StorageClient):
         return self.get(path, *args, success=success, **kwargs)
 
     def object_put(
-            self, object,
+            self, obj,
             format='json',
             hashmap=False,
             delimiter=None,
@@ -513,7 +513,7 @@ class PithosRestClient(StorageClient):
             content_disposition=None,
             manifest=None,
             permissions=None,
-            public=None,
+            public=False,
             metadata=None,
             *args, **kwargs):
         """ Full Pithos+ PUT at object level
@@ -607,12 +607,12 @@ class PithosRestClient(StorageClient):
             for key, val in metadata.items():
                 self.set_header('X-Object-Meta-' + key, val)
 
-        path = path4url(self.account, self.container, object)
+        path = path4url(self.account, self.container, obj)
         success = kwargs.pop('success', 201)
         return self.put(path, *args, success=success, **kwargs)
 
     def object_copy(
-            self, object, destination,
+            self, obj, destination,
             format='json',
             ignore_content_type=False,
             if_etag_match=None,
@@ -660,8 +660,6 @@ class PithosRestClient(StorageClient):
             { 'read':[user1, group1, user2, ...],
             'write':['user3, group2, group3, ...] }
 
-        :param permissions: update permissions
-
         :param public: (bool) If true, Object is publicly accessible
 
         :param metadata: (dict) Optional user defined metadata in the form
@@ -699,7 +697,7 @@ class PithosRestClient(StorageClient):
             for key, val in metadata.items():
                 self.set_header('X-Object-Meta-' + key, val)
 
-        path = path4url(self.account, self.container, object)
+        path = path4url(self.account, self.container, obj)
         success = kwargs.pop('success', 201)
         return self.copy(path, *args, success=success, **kwargs)
 
@@ -791,7 +789,7 @@ class PithosRestClient(StorageClient):
         return self.move(path, *args, success=success, **kwargs)
 
     def object_post(
-            self, object,
+            self, obj,
             format='json',
             update=True,
             if_etag_match=None,
@@ -893,12 +891,12 @@ class PithosRestClient(StorageClient):
                 if perm_list:
                     perms += ';' if perms else ''
                     perms += '%s=%s' % (perm_type, ','.join(perm_list))
-                self.set_header('X-Object-Sharing', perms)
+            self.set_header('X-Object-Sharing', perms)
         self.set_header('X-Object-Public', public)
         for key, val in metadata.items():
             self.set_header('X-Object-Meta-' + key, val)
 
-        path = path4url(self.account, self.container, object)
+        path = path4url(self.account, self.container, obj)
         success = kwargs.pop('success', (202, 204))
         return self.post(path, *args, success=success, **kwargs)