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

Update function names in mispevent

pull/111/head
Raphaël Vinot 2017-08-24 17:09:16 +02:00
parent 314f7eaed1
commit e567ddc877
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pymisp/mispevent.py
View File

@ -221,6 +221,10 @@ class MISPAttribute(object):
self._prepare_new_malware_sample() self._prepare_new_malware_sample()
def _json(self): def _json(self):
# DEPRECATED
return self.to_dict()
def to_dict(self):
to_return = {'type': self.type, 'category': self.category, 'to_ids': self.to_ids, to_return = {'type': self.type, 'category': self.category, 'to_ids': self.to_ids,
'distribution': self.distribution, 'value': self.value, 'distribution': self.distribution, 'value': self.value,
'comment': self.comment, 'disable_correlation': self.disable_correlation} 'comment': self.comment, 'disable_correlation': self.disable_correlation}
@ -507,6 +511,10 @@ class MISPEvent(AbstractMISP):
self.global_sig = kwargs['global_sig'] self.global_sig = kwargs['global_sig']
def _json(self): def _json(self):
# DEPTECATED
return self.to_dict()
def to_dict(self):
to_return = {'Event': {}} to_return = {'Event': {}}
to_return['Event'] = {'distribution': self.distribution, 'info': self.info, to_return['Event'] = {'distribution': self.distribution, 'info': self.info,
'date': self.date.isoformat(), 'published': self.published, 'date': self.date.isoformat(), 'published': self.published,