Fix details missing in googleapiclient.errors.HttpError (googleapis#412)

sonlac · Jon Wayne Parrott · commit f6e266199766 · 2017-07-17T09:02:18.000-07:00
Resolves: googleapis#382
diff --git a/googleapiclient/errors.py b/googleapiclient/errors.py
@@ -46,6 +46,7 @@ def __init__(self, resp, content, uri=None):
         raise TypeError("HTTP content should be bytes")
     self.content = content
     self.uri = uri
+    self.error_details = ''
 
   def _get_reason(self):
     """Calculate the reason for the error from the response content."""
@@ -54,17 +55,25 @@ def _get_reason(self):
       data = json.loads(self.content.decode('utf-8'))
       if isinstance(data, dict):
         reason = data['error']['message']
+        if 'details' in data['error']:
+            self.error_details = data['error']['details']
       elif isinstance(data, list) and len(data) > 0:
         first_error = data[0]
         reason = first_error['error']['message']
+        if 'details' in first_error['error']:
+            self.error_details = first_error['error']['details']
     except (ValueError, KeyError, TypeError):
       pass
     if reason is None:
       reason = ''
     return reason
 
   def __repr__(self):
-    if self.uri:
+    reason = self._get_reason()
+    if self.error_details:
+      return '<HttpError %s when requesting %s returned "%s". Details: "%s">' % \
+             (self.resp.status, self.uri, reason.strip(), self.error_details)
+    elif self.uri:
       return '<HttpError %s when requesting %s returned "%s">' % (
           self.resp.status, self.uri, self._get_reason().strip())
     else:
diff --git a/tests/test_errors.py b/tests/test_errors.py
@@ -41,7 +41,8 @@
    }
   ],
   "code": 400,
-  "message": "country is required"
+  "message": "country is required",
+  "details": "error details"
  }
 }
 """
@@ -61,7 +62,7 @@ def test_json_body(self):
         {'status':'400', 'content-type': 'application/json'},
         reason='Failed')
     error = HttpError(resp, content, uri='http://example.org')
-    self.assertEqual(str(error), '<HttpError 400 when requesting http://example.org returned "country is required">')
+    self.assertEqual(str(error), '<HttpError 400 when requesting http://example.org returned "country is required". Details: "error details">')
 
   def test_bad_json_body(self):
     """Test handling of bodies with invalid json."""

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@`
`41`	`41`	`}`
`42`	`42`	`],`
`43`	`43`	`"code": 400,`
`44`		`- "message": "country is required"`
	`44`	`+ "message": "country is required",`
	`45`	`+ "details": "error details"`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`"""`
`@@ -61,7 +62,7 @@ def test_json_body(self):`
`61`	`62`	`{'status':'400', 'content-type': 'application/json'},`
`62`	`63`	`reason='Failed')`
`63`	`64`	`error = HttpError(resp, content, uri='http://example.org')`
`64`		`- self.assertEqual(str(error), '<HttpError 400 when requesting http://example.org returned "country is required">')`
	`65`	`+ self.assertEqual(str(error), '<HttpError 400 when requesting http://example.org returned "country is required". Details: "error details">')`
`65`	`66`
`66`	`67`	`def test_bad_json_body(self):`
`67`	`68`	`"""Test handling of bodies with invalid json."""`