Added timeout to api calls. (#161)

Author: Doerge

slackclient/_client.py

@@ -44,7 +44,7 @@ def rtm_connect(self):
         except:
             return False
 
-    def api_call(self, method, **kwargs):
+    def api_call(self, method, timeout=None, **kwargs):
         '''
         Call the Slack Web API as documented here: https://api.slack.com/web
 
@@ -74,7 +74,7 @@ def api_call(self, method, **kwargs):
 
             See here for more information on responses: https://api.slack.com/web
         '''
-        result = json.loads(self.server.api_call(method, **kwargs))
+        result = json.loads(self.server.api_call(method, timeout=timeout, **kwargs))
         if self.server:
             if method == 'im.open':
                 if "ok" in result and result["ok"]:

slackclient/_server.py

@@ -61,8 +61,8 @@ def __str__(self):
     def __repr__(self):
         return self.__str__()
 
-    def rtm_connect(self, reconnect=False):
-        reply = self.api_requester.do(self.token, "rtm.start")
+    def rtm_connect(self, reconnect=False, timeout=None):
+        reply = self.api_requester.do(self.token, "rtm.start", timeout=timeout)
         if reply.status_code != 200:
             raise SlackConnectionError
         else:
@@ -157,24 +157,26 @@ def attach_channel(self, name, channel_id, members=None):
         if self.channels.find(channel_id) is None:
             self.channels.append(Channel(self, name, channel_id, members))
 
-    def join_channel(self, name):
+    def join_channel(self, name, timeout=None):
         '''
         Join a channel by name.
 
         Note: this action is not allowed by bots, they must be invited to channels.
         '''
         return self.api_requester.do(
             self.token,
-            "channels.join?name={}".format(name)
+            "channels.join?name={}".format(name),
+            timeout=timeout
         ).text
 
-    def api_call(self, method, **kwargs):
+    def api_call(self, method, timeout=None, **kwargs):
         '''
         Call the Slack Web API as documented here: https://api.slack.com/web
 
         :Args:
             method (str): The API Method to call. See here for a list: https://api.slack.com/methods
         :Kwargs:
+            (optional) timeout: stop waiting for a response after a given number of seconds
             (optional) kwargs: any arguments passed here will be bundled and sent to the api
             requester as post_data
                 and will be passed along to the API.
@@ -198,7 +200,7 @@ def api_call(self, method, **kwargs):
 
             See here for more information on responses: https://api.slack.com/web
         '''
-        return self.api_requester.do(self.token, method, kwargs).text
+        return self.api_requester.do(self.token, method, kwargs, timeout=timeout).text
 
 
 class SlackConnectionError(Exception):

slackclient/_slackrequest.py

@@ -7,13 +7,14 @@
 class SlackRequest(object):
 
     @staticmethod
-    def do(token, request="?", post_data=None, domain="slack.com"):
+    def do(token, request="?", post_data=None, domain="slack.com", timeout=None):
         '''
         Perform a POST request to the Slack Web API
 
         Args:
             token (str): your authentication token
             request (str): the method to call from the Slack API. For example: 'channels.list'
+            timeout (float): stop waiting for a response after a given number of seconds
             post_data (dict): key/value arguments to pass for the request. For example:
                 {'channel': 'CABC12345'}
             domain (str): if for some reason you want to send your request to something other
@@ -36,4 +37,4 @@ def do(token, request="?", post_data=None, domain="slack.com"):
         url = 'https://{0}/api/{1}'.format(domain, request)
         post_data['token'] = token
 
-        return requests.post(url, data=post_data, files=files)
+        return requests.post(url, data=post_data, files=files, timeout=timeout)