projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated .gitignore: .idea
[osm/osmclient.git]
/
osmclient
/
sol005
/
http.py
diff --git
a/osmclient/sol005/http.py
b/osmclient/sol005/http.py
index
8e80ba9
..
867db2d
100644
(file)
--- a/
osmclient/sol005/http.py
+++ b/
osmclient/sol005/http.py
@@
-17,9
+17,7
@@
from io import BytesIO
import pycurl
import json
from io import BytesIO
import pycurl
import json
-import yaml
from osmclient.common import http
from osmclient.common import http
-from osmclient.common.exceptions import ClientException
class Http(http.Http):
class Http(http.Http):
@@
-50,7
+48,7
@@
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 http_code,
json.loads(data.getvalue().decode()
)
+ return http_code,
data.getvalue().decode(
)
else:
return http_code, None
else:
return http_code, None
@@
-60,11
+58,10
@@
class Http(http.Http):
data = BytesIO()
curl_cmd = self._get_curl_cmd(endpoint)
if put_method:
data = BytesIO()
curl_cmd = self._get_curl_cmd(endpoint)
if put_method:
- curl_cmd.setopt(pycurl.
PUT, 1
)
+ curl_cmd.setopt(pycurl.
CUSTOMREQUEST, "PUT"
)
elif patch_method:
curl_cmd.setopt(pycurl.CUSTOMREQUEST, "PATCH")
elif patch_method:
curl_cmd.setopt(pycurl.CUSTOMREQUEST, "PATCH")
- else:
- curl_cmd.setopt(pycurl.POST, 1)
+ curl_cmd.setopt(pycurl.POST, 1)
curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write)
if postfields_dict is not None:
curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write)
if postfields_dict is not None:
@@
-77,7
+74,7
@@
class Http(http.Http):
(pycurl.FORM_FILE,
formfile[1])))])
elif filename is not None:
(pycurl.FORM_FILE,
formfile[1])))])
elif filename is not None:
- with open(filename, 'r') as stream:
+ with open(filename, 'r
b
') as stream:
postdata=stream.read()
curl_cmd.setopt(pycurl.POSTFIELDS, postdata)
postdata=stream.read()
curl_cmd.setopt(pycurl.POSTFIELDS, postdata)