projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssh key injection enabled with ns-create in sol005 client
[osm/osmclient.git]
/
osmclient
/
sol005
/
http.py
diff --git
a/osmclient/sol005/http.py
b/osmclient/sol005/http.py
index
c89e91b
..
d76e41e
100644
(file)
--- a/
osmclient/sol005/http.py
+++ b/
osmclient/sol005/http.py
@@
-50,13
+50,9
@@
class Http(http.Http):
curl_cmd.close()
# TODO 202 accepted should be returned somehow
if data.getvalue():
curl_cmd.close()
# TODO 202 accepted should be returned somehow
if data.getvalue():
- return json.loads(data.getvalue().decode())
- elif http_code == 404:
- return "NOT FOUND"
- elif http_code >= 300:
- return "Failed"
+ return http_code, json.loads(data.getvalue().decode())
else:
else:
- return
+ return
http_code, None
def send_cmd(self, endpoint='', postfields_dict=None,
formfile=None, filename=None,
def send_cmd(self, endpoint='', postfields_dict=None,
formfile=None, filename=None,
@@
-124,6
+120,9
@@
class Http(http.Http):
curl_cmd.setopt(pycurl.HTTPGET, 1)
curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write)
curl_cmd.perform()
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()
curl_cmd.close()
- return data.getvalue()
+ if data.getvalue():
+ return http_code, data.getvalue()
+ return http_code, None