diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-07 20:41:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-07 20:41:57 +0000 |
| commit | c7176c16a9c5bedf807ffdd50b79705737f6db5e (patch) | |
| tree | 75cca6ae873acb0c68a731a810d8e58adf88c375 /openstackclient/common/restapi.py | |
| parent | b3b59c20d2fa5396eeb43a9e702e01aa6626830e (diff) | |
| parent | be83ae763ffbcd3208ba1df9fe8b22cfe3fa6fa2 (diff) | |
| download | python-openstackclient-c7176c16a9c5bedf807ffdd50b79705737f6db5e.tar.gz | |
Merge "Add container create and delete support"
Diffstat (limited to 'openstackclient/common/restapi.py')
| -rw-r--r-- | openstackclient/common/restapi.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/openstackclient/common/restapi.py b/openstackclient/common/restapi.py index a4822a10..a646acb3 100644 --- a/openstackclient/common/restapi.py +++ b/openstackclient/common/restapi.py @@ -189,7 +189,11 @@ class RESTApi(object): :param \*\*kwargs: Optional arguments passed to ``request`` """ - return self.request('PATCH', url, data=data, json=json, **kwargs) + if json: + kwargs['json'] = json + if data: + kwargs['data'] = data + return self.request('PATCH', url, **kwargs) def post(self, url, data=None, json=None, **kwargs): """Send a POST request. Returns :class:`requests.Response` object. @@ -201,7 +205,11 @@ class RESTApi(object): :param \*\*kwargs: Optional arguments passed to ``request`` """ - return self.request('POST', url, data=data, json=json, **kwargs) + if json: + kwargs['json'] = json + if data: + kwargs['data'] = data + return self.request('POST', url, **kwargs) def put(self, url, data=None, json=None, **kwargs): """Send a PUT request. Returns :class:`requests.Response` object. @@ -213,7 +221,11 @@ class RESTApi(object): :param \*\*kwargs: Optional arguments passed to ``request`` """ - return self.request('PUT', url, data=data, json=json, **kwargs) + if json: + kwargs['json'] = json + if data: + kwargs['data'] = data + return self.request('PUT', url, **kwargs) # Command verb methods |