MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/CIRCL/PyMISP

pull/2/merge
Alexandre Dulaunoy 2015-07-30 13:39:32 +00:00
parent 79d7dba744 389f88ce8b
commit 90016f41b7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/copy_list.py
View File

@ -4,6 +4,7 @@
import sys import sys
from pymisp import PyMISP from pymisp import PyMISP
import json
from keys import cert, priv from keys import cert, priv
@ -30,7 +31,7 @@ def init(cert_to_priv=True):
def _to_utf8(request): def _to_utf8(request):
to_return = None to_return = None
if 'json' in request.headers['content-type']: if 'json' in request.headers['content-type']:
to_return = request.json() to_return = json.dumps(request.json())
else: else:
to_return = request.text.encode('utf-8') to_return = request.text.encode('utf-8')
return to_return return to_return

4
pymisp/api.py
View File

@ -84,7 +84,7 @@ class PyMISP(object):
:param event: Event object to add :param event: Event object to add
""" """
session = self.__prepare_session() session = self.__prepare_session()
return session.post(self.url, data=json.dumps(event)) return session.post(self.url, data=event)
def update_event(self, event_id, event): def update_event(self, event_id, event):
""" """
@ -94,7 +94,7 @@ class PyMISP(object):
:param event: Elements to add :param event: Elements to add
""" """
session = self.__prepare_session() session = self.__prepare_session()
return session.post(self.rest.format(event_id), data=json.dumps(event)) return session.post(self.rest.format(event_id), data=event)
def delete_event(self, event_id): def delete_event(self, event_id):
""" """