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

Try to convert event ID to integer if not None.

pull/2/merge v1.8.2
Raphaël Vinot 2015-09-13 00:31:27 +02:00
parent c133713d33
commit f731b88fde
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pymisp/api.py
View File

@ -384,6 +384,11 @@ class PyMISP(object):
to_post = {'request': {}} to_post = {'request': {}}
authorized_categs = ['Payload delivery', 'Artifacts dropped', 'Payload Installation', 'External Analysis'] authorized_categs = ['Payload delivery', 'Artifacts dropped', 'Payload Installation', 'External Analysis']
if event_id is not None:
try:
event_id = int(event_id)
except:
pass
if not isinstance(event_id, int): if not isinstance(event_id, int):
# New event # New event
to_post['request'] = self._create_event(distribution, threat_level_id, analysis, info) to_post['request'] = self._create_event(distribution, threat_level_id, analysis, info)
@ -543,8 +548,6 @@ class PyMISP(object):
details = [] details = []
for f in result['result']: for f in result['result']:
decoded = base64.b64decode(f['base64']) decoded = base64.b64decode(f['base64'])
#if not isinstance(decoded, unicode):
# decoded = decoded.encode('utf-8')
zipped = BytesIO(decoded) zipped = BytesIO(decoded)
archive = zipfile.ZipFile(zipped) archive = zipfile.ZipFile(zipped)
try: try:

2
setup.py
View File

@ -4,7 +4,7 @@ from setuptools import setup
setup( setup(
name='pymisp', name='pymisp',
version='1.8.1', version='1.8.2',
author='Raphaël Vinot', author='Raphaël Vinot',
author_email='raphael.vinot@circl.lu', author_email='raphael.vinot@circl.lu',
maintainer='Raphaël Vinot', maintainer='Raphaël Vinot',