X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fhttp.py;h=60f0a49a3d29682ee1e4b1568ffe0c0ed5fd3749;hb=refs%2Fchanges%2F20%2F6120%2F1;hp=20593b87ae233bbaa4ac5a0690fb760d2b6640d8;hpb=e82f56d898df84271b4bb55e7b702e3e5b148a82;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/http.py b/osmclient/sol005/http.py index 20593b8..60f0a49 100644 --- a/osmclient/sol005/http.py +++ b/osmclient/sol005/http.py @@ -56,11 +56,13 @@ class Http(http.Http): def send_cmd(self, endpoint='', postfields_dict=None, formfile=None, filename=None, - put_method=False): + put_method=False, patch_method=False): data = BytesIO() curl_cmd = self._get_curl_cmd(endpoint) if put_method: curl_cmd.setopt(pycurl.PUT, 1) + elif patch_method: + curl_cmd.setopt(pycurl.CUSTOMREQUEST, "PATCH") else: curl_cmd.setopt(pycurl.POST, 1) curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write) @@ -104,7 +106,7 @@ class Http(http.Http): postfields_dict=postfields_dict, formfile=formfile, filename=filename, - put_method=False) + put_method=False, patch_method=False) def put_cmd(self, endpoint='', postfields_dict=None, formfile=None, filename=None): @@ -112,7 +114,15 @@ class Http(http.Http): postfields_dict=postfields_dict, formfile=formfile, filename=filename, - put_method=True) + put_method=True, patch_method=False) + + def patch_cmd(self, endpoint='', postfields_dict=None, + formfile=None, filename=None): + return self.send_cmd(endpoint=endpoint, + postfields_dict=postfields_dict, + formfile=formfile, + filename=filename, + put_method=False, patch_method=True) def get2_cmd(self, endpoint): data = BytesIO() @@ -120,6 +130,9 @@ class Http(http.Http): curl_cmd.setopt(pycurl.HTTPGET, 1) curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write) curl_cmd.perform() + http_code = curl_cmd.getinfo(pycurl.HTTP_CODE) curl_cmd.close() - return data.getvalue() + if data.getvalue(): + return http_code, data.getvalue() + return http_code, None