More power to the SerializationError

elasticsearch/connection.py

@@ -85,7 +85,7 @@ class RequestsHttpConnection(Connection):
             raw_data = response.text
         except (requests.ConnectionError, requests.Timeout) as e:
             self.log_request_fail(method, request.url, time.time() - start, exception=e)
-            raise ConnectionError(e)
+            raise ConnectionError('N/A', str(e), e)
 
         # raise errors based on http status codes, let the client handle those if needed
         if not (200 <= response.status_code < 300):

elasticsearch/serializer.py

@@ -13,7 +13,7 @@ class JSONSerializer(object):
         try:
             return json.loads(s)
         except (ValueError, TypeError) as e:
-            raise SerializationError(e)
+            raise SerializationError(s, e)
 
     def dumps(self, data):
         # don't serialize strings
@@ -23,6 +23,6 @@ class JSONSerializer(object):
         try:
             return json.dumps(data, default=self.default)
         except (ValueError, TypeError) as e:
-            raise SerializationError(e)
+            raise SerializationError(data, e)