Merge cfb2304 into f3745a7

google · May 6, 2019 · 7a3a8d6 · 7a3a8d6
2 parents f3745a7 + cfb2304
commit 7a3a8d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/apitools/base/py/exceptions.py b/apitools/base/py/exceptions.py
@@ -53,19 +53,23 @@ class HttpError(CommunicationError):
 
     def __init__(self, response, content, url,
                  method_config=None, request=None):
-        super(HttpError, self).__init__()
+        error_message = HttpError._build_message(response, content, url)
+        super(HttpError, self).__init__(error_message)
         self.response = response
         self.content = content
         self.url = url
         self.method_config = method_config
         self.request = request
 
     def __str__(self):
-        content = self.content
+        return HttpError._build_message(self.response, self.content, self.url)
+
+    @staticmethod
+    def _build_message(response, content, url):
         if isinstance(content, bytes):
-            content = self.content.decode('ascii', 'replace')
+            content = content.decode('ascii', 'replace')
         return 'HttpError accessing <%s>: response: <%s>, content <%s>' % (
-            self.url, self.response, content)
+            url, response, content)
 
     @property
     def status_code(self):

diff --git a/apitools/base/py/exceptions_test.py b/apitools/base/py/exceptions_test.py
@@ -46,6 +46,12 @@ def testForbidden(self):
         self.assertIsInstance(err, exceptions.HttpForbiddenError)
         self.assertEquals(err.status_code, 403)
 
+    def testExceptionMessageIncludesErrorDetails(self):
+        err = exceptions.HttpError.FromResponse(_MakeResponse(403))
+        self.assertIn('403', repr(err))
+        self.assertIn('http://www.google.com', repr(err))
+        self.assertIn('{"field": "abc"}', repr(err))
+
     def testNotFound(self):
         err = exceptions.HttpError.FromResponse(_MakeResponse(404))
         self.assertIsInstance(err, exceptions.HttpError)