From e3d4226f6582db8008f3c0ca73ee0716a21f3d9a Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 7 Dec 2017 14:14:38 +0100 Subject: [PATCH 2/2] jsonresponse: fix exception logging for exception containing unencoded UTF-8 (fixes #20498) --- passerelle/utils/jsonresponse.py | 2 +- tests/test_dummy.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/passerelle/utils/jsonresponse.py b/passerelle/utils/jsonresponse.py index f219a7d..d1cd88c 100644 --- a/passerelle/utils/jsonresponse.py +++ b/passerelle/utils/jsonresponse.py @@ -126,7 +126,7 @@ class to_json(object): extras.update({'body': req.body}) if (not isinstance(e, (Http404, PermissionDenied, ObjectDoesNotExist)) and getattr(e, 'log_error', True)): - logger.exception("Error occurred while processing request", extra=extras) + logger.exception(u"Error occurred while processing request", extra=extras) elif isinstance(e, ObjectDoesNotExist): logger.warning('object not found: %r', e, extra=extras) elif isinstance(e, PermissionDenied): diff --git a/tests/test_dummy.py b/tests/test_dummy.py index 8d522f0..14f877d 100644 --- a/tests/test_dummy.py +++ b/tests/test_dummy.py @@ -19,7 +19,6 @@ def dummy(db): resource_pk=conn.pk) return conn -@pytest.mark.xfail def test_exception_with_utf8(app, dummy, mailoutbox, caplog): app.get('/dummy/dummy/exception_with_utf8/', status=500) assert u'Exception: é' in mailoutbox[0].body -- 2.1.4