Merge pull request #22 from Synforge/master

Python 3 support

Author: rawdigits

slackclient/_channel.py

@@ -13,7 +13,7 @@ def __eq__(self, compare_str):
 
     def __str__(self):
         data = ""
-        for key in self.__dict__.keys():
+        for key in list(self.__dict__.keys()):
             data += "{} : {}\n".format(key, str(self.__dict__[key])[:40])
         return data
 

slackclient/_client.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-#mostly a proxy object to abstract how some of this works
+# mostly a proxy object to abstract how some of this works
 
 import json
 
@@ -21,7 +21,8 @@ def api_call(self, method, **kwargs):
         return self.server.api_call(method, **kwargs)
 
     def rtm_read(self):
-        #in the future, this should handle some events internally i.e. channel creation
+        # in the future, this should handle some events internally i.e. channel
+        # creation
         if self.server:
             json_data = self.server.websocket_safe_read()
             data = []
@@ -47,5 +48,6 @@ def process_changes(self, data):
                 self.server.attach_channel(channel["user"], channel["id"], [])
             pass
 
+
 class SlackNotConnected(Exception):
     pass

slackclient/_im.py

@@ -12,7 +12,7 @@ def __eq__(self, compare_str):
 
     def __str__(self):
         data = ""
-        for key in self.__dict__.keys():
+        for key in list(self.__dict__.keys()):
             if key != "server":
                 data += "{} : {}\n".format(key, str(self.__dict__[key])[:40])
         return data

slackclient/_server.py

@@ -6,6 +6,7 @@
 from websocket import create_connection
 import json
 
+
 class Server(object):
     def __init__(self, token, connect=True):
         self.token = token
@@ -21,16 +22,19 @@ def __init__(self, token, connect=True):
 
         if connect:
             self.rtm_connect()
+
     def __eq__(self, compare_str):
         if compare_str == self.domain or compare_str == self.token:
             return True
         else:
             return False
+
     def __str__(self):
         data = ""
-        for key in self.__dict__.keys():
+        for key in list(self.__dict__.keys()):
             data += "{} : {}\n".format(key, str(self.__dict__[key])[:40])
         return data
+
     def __repr__(self):
         return self.__str__()
 
@@ -39,7 +43,7 @@ def rtm_connect(self, reconnect=False):
         if reply.code != 200:
             raise SlackConnectionError
         else:
-            login_data = json.loads(reply.read())
+            login_data = json.loads(reply.read().decode('utf-8'))
             if login_data["ok"]:
                 self.ws_url = login_data['url']
                 if not reconnect:
@@ -70,7 +74,9 @@ def parse_channel_data(self, channel_data):
                 channel["name"] = channel["id"]
             if "members" not in channel:
                 channel["members"] = []
-            self.attach_channel(channel["name"], channel["id"], channel["members"])
+            self.attach_channel(channel["name"],
+                                channel["id"],
+                                channel["members"])
 
     def parse_user_data(self, user_data):
         for user in user_data:
@@ -92,7 +98,10 @@ def ping(self):
         return self.send_to_websocket({"type": "ping"})
 
     def websocket_safe_read(self):
-        """Returns data if available, otherwise ''. Newlines indicate multiple messages """
+        """ Returns data if available, otherwise ''. Newlines indicate multiple
+            messages
+        """
+
         data = ""
         while True:
             try:
@@ -107,14 +116,17 @@ def attach_channel(self, name, id, members=[]):
         self.channels.append(Channel(self, name, id, members))
 
     def join_channel(self, name):
-        print self.api_requester.do(self.token, "channels.join?name={}".format(name)).read()
+        print(self.api_requester.do(self.token,
+                                    "channels.join?name={}".format(name)).read())
 
     def api_call(self, method, **kwargs):
         reply = self.api_requester.do(self.token, method, kwargs)
         return reply.read()
 
+
 class SlackConnectionError(Exception):
     pass
 
+
 class SlackLoginError(Exception):
     pass

slackclient/_slackrequest.py

@@ -1,14 +1,22 @@
 import time
-import urllib
-import urllib2
+
+try:
+    # Try for Python3
+    from urllib.parse import urlencode 
+    from urllib.request import urlopen 
+except:
+    # Looks like Python2
+    from urllib import urlencode 
+    from urllib2 import urlopen 
+
 
 class SlackRequest(object):
     def __init__(self):
         pass
 
     def do(self, token, request="?", post_data={}, domain="slack.com"):
         post_data["token"] = token
-        post_data = urllib.urlencode(post_data)
+        post_data = urlencode(post_data)
         url = 'https://{}/api/{}'.format(domain, request)
-        return urllib2.urlopen(url, post_data)
+        return urlopen(url, post_data.encode('utf-8'))
 

slackclient/_user.py

@@ -14,7 +14,7 @@ def __eq__(self, compare_str):
 
     def __str__(self):
         data = ""
-        for key in self.__dict__.keys():
+        for key in list(self.__dict__.keys()):
             if key != "server":
                 data += "{} : {}\n".format(key, str(self.__dict__[key])[:40])
         return data