From d8cbe1ac78719b54fb529fb5433a9159a7ca4805 Mon Sep 17 00:00:00 2001 From: Honza Kral Date: Tue, 30 Jul 2013 15:05:46 +0200 Subject: [PATCH] More power to the SerializationError --- elasticsearch/connection.py | 2 +- elasticsearch/serializer.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/elasticsearch/connection.py b/elasticsearch/connection.py index 19a904d2..370060c9 100644 --- a/elasticsearch/connection.py +++ b/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): diff --git a/elasticsearch/serializer.py b/elasticsearch/serializer.py index 1f3dd540..cbf0a2d7 100644 --- a/elasticsearch/serializer.py +++ b/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)