From 8377dc63c0fd63d98a97a0943e65a3baba6a75cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 15 Sep 2017 10:06:06 +0200 Subject: [PATCH] Fix attribute error accessing response.text The response object *should* be a requests.Response object, which *should* have a .text property. However, there are situations where this is not the case, and in those cases we now won't produce an AttributeError. --- pillar/sdk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pillar/sdk.py b/pillar/sdk.py index bb8260cc..119e33e7 100644 --- a/pillar/sdk.py +++ b/pillar/sdk.py @@ -94,8 +94,9 @@ class FlaskInternalApi(pillarsdk.Api): return response exception = exceptions.exception_for_status(response.status_code) + text = getattr(response, 'text', '') if exception: - raise exception(response, response.text) + raise exception(response, text) - raise exceptions.ConnectionError(response, response.text, + raise exceptions.ConnectionError(response, text, "Unknown response code: %s" % response.status_code)