Moved from urllib to requests

Peter · Peter · commit 52090d7be82b · 2015-12-22T16:11:13.000-05:00
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='slackclient',
-      version='0.16',
+      version='0.17',
       description='Python client for Slack.com',
       url='http://github.com/slackhq/python-slackclient',
       author='Ryan Huber',
@@ -10,6 +10,6 @@
       packages=['slackclient'],
       install_requires=[
         'websocket-client',
-        'future',
+        'requests',
       ],
       zip_safe=False)
diff --git a/slackclient/_server.py b/slackclient/_server.py
@@ -41,10 +41,10 @@ def __repr__(self):
 
     def rtm_connect(self, reconnect=False):
         reply = self.api_requester.do(self.token, "rtm.start")
-        if reply.code != 200:
+        if reply.status_code != 200:
             raise SlackConnectionError
         else:
-            login_data = json.loads(reply.read().decode('utf-8'))
+            login_data = reply.json()
             if login_data["ok"]:
                 self.ws_url = login_data['url']
                 if not reconnect:
@@ -129,11 +129,10 @@ def attach_channel(self, name, id, members=[]):
 
     def join_channel(self, name):
         print(self.api_requester.do(self.token,
-                                    "channels.join?name={}".format(name)).read())
+                                    "channels.join?name={}".format(name)).text)
 
     def api_call(self, method, **kwargs):
-        reply = self.api_requester.do(self.token, method, kwargs)
-        return reply.read()
+        return self.api_requester.do(self.token, method, kwargs).text
 
 
 class SlackConnectionError(Exception):
diff --git a/slackclient/_slackrequest.py b/slackclient/_slackrequest.py
@@ -1,16 +1,9 @@
-import time
-from future.moves.urllib.parse import urlparse, urlencode
-from future.moves.urllib.request import urlopen, Request
-from future.moves.urllib.error import HTTPError
+import requests
 
 
 class SlackRequest(object):
-    def __init__(self):
-        pass
-
     def do(self, token, request="?", post_data={}, domain="slack.com"):
-        post_data["token"] = token
-        post_data = urlencode(post_data)
-        url = 'https://{}/api/{}'.format(domain, request)
-        return urlopen(url, post_data.encode('utf-8'))
-
+        return requests.post(
+            'https://{0}/api/{1}'.format(domain, request),
+            data=dict(post_data, token=token),
+        )
