Merge pull request rpcope1#1 from pramen/pramen-patch-1

Fixing bug in 2 methods

Author: pramen

PythonConfluenceAPI/api.py

@@ -574,7 +574,7 @@ def create_new_private_space(self, space_definition, callback=None):
 
     def update_content_by_id(self, content_data, content_id, callback=None):
         assert isinstance(content_data, dict) and set(content_data.keys()) >= self.UPDATE_CONTENT_REQUIRED_KEYS
-        return self._service_put_request("rest/api/content/{id}".format(content_id), data=json.dumps(content_data),
+        return self._service_put_request("rest/api/content/{id}".format(id=content_id), data=json.dumps(content_data),
                                          headers={"Content-Type": "application/json"}, callback=callback)
 
     def update_attachment_metadata(self, content_id, attachment_id, new_metadata, callback=None):
@@ -618,7 +618,7 @@ def delete_content_by_id(self, content_id, status=None, callback=None):
         params = {}
         if status:
             params["status"] = status
-        return self._service_delete_request("rest/api/content/{id}".format(content_id), params=params,
+        return self._service_delete_request("rest/api/content/{id}".format(id=content_id), params=params,
                                             callback=callback)
 
     def delete_label_by_id(self, content_id, label_name, callback=None):
@@ -632,4 +632,4 @@ def delete_property(self, content_id, property_key, callback=None):
 
     def delete_space(self, space_key, callback=None):
         return self._service_delete_request("rest/api/space/{key}".format(key=space_key),
-                                            callback=callback)
+                                            callback=callback)