diff --git a/senpy/extensions.py b/senpy/extensions.py index facdc1ccce474038d07b8f9afeecf7ef66f02330..462be2a86e8c8c05092aa1a6fe01ecb19e1b9d42 100644 --- a/senpy/extensions.py +++ b/senpy/extensions.py @@ -16,7 +16,6 @@ import os import copy import errno import logging -import traceback logger = logging.getLogger(__name__) @@ -171,22 +170,14 @@ class Senpy(object): by api.parse_call(). """ logger.debug("analysing request: {}".format(request)) - try: - entries = request.entries - request.entries = [] - plugins = self._get_plugins(request) - results = request - for i in self._process_entries(entries, results, plugins): - results.entries.append(i) - self.convert_emotions(results) - logger.debug("Returning analysis result: {}".format(results)) - except (Error, Exception) as ex: - if not isinstance(ex, Error): - msg = "Error during analysis: {} \n\t{}".format(ex, - traceback.format_exc()) - ex = Error(message=msg, status=500) - logger.exception('Error returning analysis result') - raise ex + entries = request.entries + request.entries = [] + plugins = self._get_plugins(request) + results = request + for i in self._process_entries(entries, results, plugins): + results.entries.append(i) + self.convert_emotions(results) + logger.debug("Returning analysis result: {}".format(results)) results.analysis = [i['plugin'].id for i in results.analysis] return results diff --git a/tests/test_extensions.py b/tests/test_extensions.py index 849f5d9faa567851f83814f1ecbf1438b4a46d71..af8b11b9a12854d7cba17749f1a8578e15e2f32e 100644 --- a/tests/test_extensions.py +++ b/tests/test_extensions.py @@ -182,8 +182,7 @@ class ExtensionsTest(TestCase): analyse(self.senpy, input='nothing', algorithm='MOCK') assert False except Exception as ex: - assert 'generic exception on analysis' in ex['message'] - assert ex['status'] == 500 + assert 'generic exception on analysis' in str(ex) def test_filtering(self): """ Filtering plugins """