Skip to content

Commit 5766321

Browse files
committed
Removes files from api_calls before JSON encoding, so the request is properly formatted.
Fixes #110.
1 parent c36dbf4 commit 5766321

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

slackclient/_slackrequest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ def do(token, request="?", post_data=None, domain="slack.com"):
2121
'''
2222
post_data = post_data or {}
2323

24+
# Pull file out so it isn't JSON encoded like normal fields.
25+
files = {'file': post_data.pop('file')} if 'file' in post_data else None
26+
2427
for k, v in six.iteritems(post_data):
2528
if not isinstance(v, six.string_types):
2629
post_data[k] = json.dumps(v)
2730

2831
url = 'https://{0}/api/{1}'.format(domain, request)
2932
post_data['token'] = token
30-
files = {'file': post_data.pop('file')} if 'file' in post_data else None
3133

3234
return requests.post(url, data=post_data, files=files)

0 commit comments

Comments
 (0)