Merge pull request #115 from jasedit/master

Removes files from api_calls before JSON encoding, so the request is properly formatted.

Author: jammons

slackclient/_slackrequest.py

@@ -21,12 +21,14 @@ def do(token, request="?", post_data=None, domain="slack.com"):
         '''
         post_data = post_data or {}
 
+        # Pull file out so it isn't JSON encoded like normal fields.
+        files = {'file': post_data.pop('file')} if 'file' in post_data else None
+
         for k, v in six.iteritems(post_data):
             if not isinstance(v, six.string_types):
                 post_data[k] = json.dumps(v)
 
         url = 'https://{0}/api/{1}'.format(domain, request)
         post_data['token'] = token
-        files = {'file': post_data.pop('file')} if 'file' in post_data else None
 
         return requests.post(url, data=post_data, files=files)

tests/data/slack_logo.png

@@ -1,6 +1,21 @@
 from slackclient._slackrequest import SlackRequest
 import json
+import os
 
+def test_post_file(mocker):
+    requests = mocker.patch('slackclient._slackrequest.requests')
+
+    response = SlackRequest.do('xoxb-123',
+        'files.upload',
+        {'file': open(os.path.join('.', 'tests', 'data', 'slack_logo.png'), 'rb'),
+            'filename': 'slack_logo.png'})
+
+    assert requests.post.call_count == 1
+    args, kwargs = requests.post.call_args
+    assert 'https://slack.com/api/files.upload' == args[0]
+    assert {'filename': 'slack_logo.png',
+            'token': 'xoxb-123'} == kwargs['data']
+    assert None != kwargs['files']
 
 def test_post_attachements(mocker):
     requests = mocker.patch('slackclient._slackrequest.requests')