Skip to content

Fix Unicode Issue #85

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
jarcoal wants to merge 1 commit into from
Closed

Fix Unicode Issue #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion intercom/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def send_request_to_path(cls, method, url, auth, params=None):
@classmethod
def parse_body(cls, resp):
try:
decoded_body = resp.content.decode()
decoded_body = resp.text
if not decoded_body: # return early for empty responses (issue-72)
return
body = json.loads(decoded_body)
Expand Down
28 changes: 14 additions & 14 deletions tests/unit/test_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,47 +25,47 @@ class RequestTest(unittest.TestCase):

@istest
def it_raises_resource_not_found(self):
resp = Mock(content='{}', status_code=404)
resp = Mock(text='{}', status_code=404)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.ResourceNotFound):
Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)

@istest
def it_raises_authentication_error_unauthorized(self):
resp = Mock(content='{}', status_code=401)
resp = Mock(text='{}', status_code=401)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.AuthenticationError):
Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)

@istest
def it_raises_authentication_error_forbidden(self):
resp = Mock(content='{}', status_code=403)
resp = Mock(text='{}', status_code=403)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.AuthenticationError):
Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)

@istest
def it_raises_server_error(self):
resp = Mock(content='{}', status_code=500)
resp = Mock(text='{}', status_code=500)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.ServerError):
Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)

@istest
def it_raises_bad_gateway_error(self):
resp = Mock(content='{}', status_code=502)
resp = Mock(text='{}', status_code=502)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.BadGatewayError):
Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)

@istest
def it_raises_service_unavailable_error(self):
resp = Mock(content='{}', status_code=503)
resp = Mock(text='{}', status_code=503)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.ServiceUnavailableError):
Expand All @@ -83,7 +83,7 @@ def it_raises_an_unexpected_typed_error(self):
]
}
content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
try:
Expand All @@ -105,7 +105,7 @@ def it_raises_an_unexpected_untyped_error(self):
]
}
content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
try:
Expand All @@ -131,7 +131,7 @@ def it_raises_a_bad_request_error(self):
payload['errors'][0]['type'] = code

content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.BadRequestError):
Expand All @@ -152,7 +152,7 @@ def it_raises_an_authentication_error(self):
payload['errors'][0]['type'] = code

content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.AuthenticationError):
Expand All @@ -170,7 +170,7 @@ def it_raises_resource_not_found_by_type(self):
]
}
content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.ResourceNotFound):
Expand All @@ -188,7 +188,7 @@ def it_raises_rate_limit_exceeded(self):
]
}
content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.RateLimitExceeded):
Expand All @@ -206,7 +206,7 @@ def it_raises_a_service_unavailable_error(self):
]
}
content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.ServiceUnavailableError):
Expand All @@ -224,7 +224,7 @@ def it_raises_a_multiple_matching_users_error(self):
]
}
content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(intercom.MultipleMatchingUsersError):
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ def it_raises_a_multiple_matching_users_error_when_receiving_a_conflict(self):
'x-ratelimit-reset': 1427932858
}
content = json.dumps(payload).encode('utf-8')
resp = Mock(content=content, status_code=200, headers=headers)
resp = Mock(text=content, status_code=200, headers=headers)
with patch('requests.request') as mock_method:
mock_method.return_value = resp
with assert_raises(MultipleMatchingUsersError):
Expand Down