code/twython
1
Fork 0
Code Issues 23 Pull requests 4 Projects Releases 5 Packages Wiki Activity Actions

twython/api.py: JSON error is not raised if the response content is empty and the status code is not 204. If params is not a dictionary, _transparent_params is not called

Browse source
This commit is contained in:
Jose Manuel Delicado 2017-10-07 18:26:21 +02:00
parent 12e6b34d1d
commit 748d28cc71
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
twython/api.py
View file

@ -140,7 +140,11 @@ class Twython(EndpointsMixin, object):
params = params or {} params = params or {}
func = getattr(self.client, method) func = getattr(self.client, method)
params, files = _transparent_params(params) if type(params) is dict:
params, files = _transparent_params(params)
else:
params = params
files = list()
requests_args = {} requests_args = {}
for k, v in self.client_args.items(): for k, v in self.client_args.items():
@ -192,15 +196,16 @@ class Twython(EndpointsMixin, object):
error_message, error_message,
error_code=response.status_code, error_code=response.status_code,
retry_after=response.headers.get('X-Rate-Limit-Reset')) retry_after=response.headers.get('X-Rate-Limit-Reset'))
content=""
try: try:
if response.status_code == 204: if response.status_code == 204:
content = response.content content = response.content
else: else:
content = response.json() content = response.json()
except ValueError: except ValueError:
raise TwythonError('Response was not valid JSON. \ if response.content!="":
Unable to decode.') raise TwythonError('Response was not valid JSON. \
Unable to decode.')
return content return content