Skip to content

Bugfix: use apparent_encoding if encoding is set to None #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maiiku wants to merge 2 commits into from
Closed

Bugfix: use apparent_encoding if encoding is set to None #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f60d9e
Bugfix: use apparent_encoding if encoding is set to None
maiiku May 8, 2015
964444b
Allow values of custom attributes to be None.
Apr 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion intercom/lib/flat_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ def __init__(self, *args, **kwargs):
def __setitem__(self, key, value):
if not (
isinstance(value, numbers.Real) or
isinstance(value, six.string_types)
isinstance(value, six.string_types) or
value is None
):
raise ValueError(
"custom data only allows string and real number values")
Expand Down
9 changes: 6 additions & 3 deletions intercom/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ def send_request_to_path(cls, method, url, auth, params=None):
@classmethod
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)
# return early for empty responses (issue-72)
if not resp.content or not resp.content.strip():
return
# use supplied encoding to decode the response content
decoded_body = resp.content.decode(
resp.encoding or resp.apparent_encoding
)
body = json.loads(decoded_body)
if body.get('type') == 'error.list':
cls.raise_application_errors_on_failure(body, resp.status_code)
Expand Down