From 92756381e8177a0e88e0cf70b84967915eb15d06 Mon Sep 17 00:00:00 2001 From: Jacek Date: Tue, 28 Apr 2015 22:44:38 +0200 Subject: [PATCH 1/2] fixing none error --- intercom/lib/flat_store.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intercom/lib/flat_store.py b/intercom/lib/flat_store.py index 1c330436..15624252 100644 --- a/intercom/lib/flat_store.py +++ b/intercom/lib/flat_store.py @@ -10,7 +10,7 @@ def __init__(self, *args, **kwargs): self.update(*args, **kwargs) def __setitem__(self, key, value): - if not ( + if value is not None and not ( isinstance(value, numbers.Real) or isinstance(value, six.string_types) ): From fbe093d9fa1d4cb752424ab67d7a8587ce9e763e Mon Sep 17 00:00:00 2001 From: Jacek Date: Wed, 29 Apr 2015 00:52:52 +0200 Subject: [PATCH 2/2] for some reason intercom started to return another version of empty string ' ' --- intercom/request.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intercom/request.py b/intercom/request.py index c19ccecf..026ddefa 100644 --- a/intercom/request.py +++ b/intercom/request.py @@ -43,9 +43,9 @@ def send_request_to_path(cls, method, url, auth, params=None): def parse_body(cls, resp): try: # use supplied encoding to decode the response content - decoded_body = resp.content.decode(resp.encoding) - if not decoded_body: # return early for empty responses (issue-72) + if not resp.content or resp.content == ' ': # return early for empty responses (issue-72) return + decoded_body = resp.content.decode(resp.encoding) body = json.loads(decoded_body) if body.get('type') == 'error.list': cls.raise_application_errors_on_failure(body, resp.status_code)