From f731b88fde84becdb871eccda3fa87526d594e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Sun, 13 Sep 2015 00:31:27 +0200 Subject: [PATCH] Try to convert event ID to integer if not None. --- pymisp/api.py | 7 +++++-- setup.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pymisp/api.py b/pymisp/api.py index 1b8b83a..5773850 100644 --- a/pymisp/api.py +++ b/pymisp/api.py @@ -384,6 +384,11 @@ class PyMISP(object): to_post = {'request': {}} 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): # New event to_post['request'] = self._create_event(distribution, threat_level_id, analysis, info) @@ -543,8 +548,6 @@ class PyMISP(object): details = [] for f in result['result']: decoded = base64.b64decode(f['base64']) - #if not isinstance(decoded, unicode): - # decoded = decoded.encode('utf-8') zipped = BytesIO(decoded) archive = zipfile.ZipFile(zipped) try: diff --git a/setup.py b/setup.py index 2baeaa1..e1c4396 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup setup( name='pymisp', - version='1.8.1', + version='1.8.2', author='Raphaël Vinot', author_email='raphael.vinot@circl.lu', maintainer='Raphaël Vinot',