From cd25559c94eed8aeeef64562a4ce8b1e6760c62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Sat, 27 Aug 2016 18:13:15 +0200 Subject: [PATCH] Fix flattening, fix python2.7 --- pymisp/api.py | 6 +++++- tests/test_offline.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pymisp/api.py b/pymisp/api.py index eef425c..8b73529 100644 --- a/pymisp/api.py +++ b/pymisp/api.py @@ -168,7 +168,11 @@ class PyMISP(object): for where, errors in response['errors'].items(): if isinstance(errors, dict): for where, msg in errors.items(): - messages.append('Error in {}: {}'.format(where, msg)) + if isinstance(msg, list): + for m in msg: + messages.append('Error in {}: {}'.format(where, m)) + else: + messages.append('Error in {}: {}'.format(where, msg)) else: for e in errors: if isinstance(e, str): diff --git a/tests/test_offline.py b/tests/test_offline.py index a7fbf74..0dde96a 100644 --- a/tests/test_offline.py +++ b/tests/test_offline.py @@ -101,7 +101,7 @@ class TestOffline(unittest.TestCase): def test_newEvent(self, m): error_empty_info = {'message': 'The event could not be saved.', 'name': 'Add event failed.', 'errors': {'Event': {'info': ['Info cannot be empty.']}}, 'url': '/events/add'} - error_empty_info_flatten = {'message': 'The event could not be saved.', 'name': 'Add event failed.', 'errors': ["Error in info: ['Info cannot be empty.']"], 'url': '/events/add'} + error_empty_info_flatten = {u'message': u'The event could not be saved.', u'name': u'Add event failed.', u'errors': [u"Error in info: Info cannot be empty."], u'url': u'/events/add'} self.initURI(m) pymisp = PyMISP(self.domain, self.key) with self.assertRaises(pm.api.NewEventError):