From 637c1d681b7c932b3d4bbc1ae492234dd61a5890 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 14 May 2019 10:34:41 +0200 Subject: [PATCH 3/5] api_entreprise: uses exception_to_text() to display exceptions (#33056) --- passerelle/apps/api_entreprise/models.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/passerelle/apps/api_entreprise/models.py b/passerelle/apps/api_entreprise/models.py index 5a383c36..8153d140 100644 --- a/passerelle/apps/api_entreprise/models.py +++ b/passerelle/apps/api_entreprise/models.py @@ -31,11 +31,12 @@ from django.core.urlresolvers import reverse from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint -from passerelle.utils.jsonresponse import APIError +from passerelle.utils.jsonresponse import APIError, exception_to_text from passerelle.views import WrongParameter DOCUMENT_SIGNATURE_MAX_AGE = timedelta(days=7) + def normalize_dates(data): timestamp_to_datetime = {} for key in data: @@ -87,7 +88,7 @@ class APIEntreprise(BaseResource): except requests.RequestException as e: raise APIError(u'API-entreprise connection error: %s' % response.status_code, - data={'error': unicode(e)}) + data={'error': exception_to_text(e)}) try: data = response.json() except ValueError as e: @@ -95,9 +96,10 @@ class APIEntreprise(BaseResource): raise APIError( u'API-entreprise returned non-JSON content with status %s: %s' % (response.status_code, content), - data={'status_code': response.status_code, - 'exception': unicode(e), - 'content': content, + data={ + 'status_code': response.status_code, + 'exception': exception_to_text(e), + 'content': content, }) if response.status_code != 200: if data.get('error') == 'not_found': -- 2.20.1