Merge branch 'rickhanlonii-rh-cleanup'

Author: Leah Jones

_pytest/conftest.py

@@ -21,16 +21,18 @@ def unverified_post(*args, **kwargs):
 
 @pytest.fixture
 def server(monkeypatch):
-    myserver = Server('xoxp-1234123412341234-12341234-1234', False)
-    return myserver
+    my_server = Server('xoxp-1234123412341234-12341234-1234', False)
+    return my_server
+
 
 @pytest.fixture
 def slackclient(server):
-    myslackclient = SlackClient('xoxp-1234123412341234-12341234-1234')
-    return myslackclient
+    my_slackclient = SlackClient('xoxp-1234123412341234-12341234-1234')
+    return my_slackclient
+
 
 @pytest.fixture
 def channel(server):
-    mychannel = Channel(server, "somechannel", "C12341234", ["user"])
-    return mychannel
+    my_channel = Channel(server, "somechannel", "C12341234", ["user"])
+    return my_channel
 

_pytest/test_channel.py

@@ -1,9 +1,11 @@
 from slackclient._channel import Channel
 import pytest
 
+
 def test_Channel(channel):
     assert type(channel) == Channel
 
+
 @pytest.mark.xfail
 def test_Channel_send_message(channel):
     channel.send_message('hi')

_pytest/test_server.py

@@ -4,30 +4,35 @@
 import json
 import pytest
 
+
 @pytest.fixture
-def login_data():
-    login_data = open('_pytest/data/rtm.start.json','r').read()
-    login_data = json.loads(login_data)
-    return login_data
+def login_fixture():
+    file_login_data = open('_pytest/data/rtm.start.json', 'r').read()
+    json_login_data = json.loads(file_login_data)
+    return json_login_data
+
 
 def test_Server(server):
     assert type(server) == Server
 
 
-def test_Server_parse_channel_data(server, login_data):
-    server.parse_channel_data(login_data["channels"])
+def test_Server_parse_channel_data(server, login_fixture):
+    server.parse_channel_data(login_fixture["channels"])
     assert type(server.channels.find('general')) == Channel
 
-def test_Server_parse_user_data(server, login_data):
-    server.parse_user_data(login_data["users"])
+
+def test_Server_parse_user_data(server, login_fixture):
+    server.parse_user_data(login_fixture["users"])
     assert type(server.users.find('fakeuser')) == User
 
+
 def test_Server_cantconnect(server):
     with pytest.raises(SlackLoginError):
         reply = server.ping()
 
+
 @pytest.mark.xfail
 def test_Server_ping(server, monkeypatch):
-    #monkeypatch.setattr("", lambda: True)
+    # monkeypatch.setattr("", lambda: True)
     monkeypatch.setattr("websocket.create_connection", lambda: True)
     reply = server.ping()

_pytest/test_slackclient.py

@@ -3,24 +3,28 @@
 import json
 import pytest
 
+
 @pytest.fixture
-def channel_created():
-    channel_created = open('_pytest/data/channel.created.json', 'r').read()
-    channel_created = json.loads(channel_created)
-    return channel_created
+def channel_created_fixture():
+    file_channel_created_data = open('_pytest/data/channel.created.json', 'r').read()
+    json_channel_created_data = json.loads(file_channel_created_data)
+    return json_channel_created_data
+
 
 @pytest.fixture
-def im_created():
-    channel_created = open('_pytest/data/im.created.json', 'r').read()
-    channel_created = json.loads(channel_created)
-    return channel_created
+def im_created_fixture():
+    file_channel_created_data = open('_pytest/data/im.created.json', 'r').read()
+    json_channel_created_data = json.loads(file_channel_created_data)
+    return json_channel_created_data
+
 
 def test_SlackClient(slackclient):
     assert type(slackclient) == SlackClient
 
-def test_SlackClient_process_changes(slackclient, channel_created, im_created):
-    slackclient.process_changes(channel_created)
+
+def test_SlackClient_process_changes(slackclient, channel_created_fixture, im_created_fixture):
+    slackclient.process_changes(channel_created_fixture)
     assert type(slackclient.server.channels.find('fun')) == Channel
-    slackclient.process_changes(im_created)
+    slackclient.process_changes(im_created_fixture)
     assert type(slackclient.server.channels.find('U123BL234')) == Channel
 

slackclient/_channel.py

@@ -1,9 +1,9 @@
 class Channel(object):
-    def __init__(self, server, name, id, members=[]):
+    def __init__(self, server, name, channel_id, members=None):
         self.server = server
         self.name = name
-        self.id = id
-        self.members = members
+        self.id = channel_id
+        self.members = [] if members is None else members
 
     def __eq__(self, compare_str):
         if self.name == compare_str or self.name == "#" + compare_str or self.id == compare_str:
@@ -23,4 +23,3 @@ def __repr__(self):
     def send_message(self, message):
         message_json = {"type": "message", "channel": self.id, "text": message}
         self.server.send_to_websocket(message_json)
-

slackclient/_client.py

@@ -5,6 +5,7 @@
 
 from slackclient._server import Server
 
+
 class SlackClient(object):
     def __init__(self, token):
         self.token = token

slackclient/_im.py

@@ -1,8 +1,8 @@
 class Im(object):
-    def __init__(self, server, user, id):
+    def __init__(self, server, user, im_id):
         self.server = server
         self.user = user
-        self.id = id
+        self.id = im_id
 
     def __eq__(self, compare_str):
         if self.id == compare_str or self.user == compare_str:
@@ -23,4 +23,3 @@ def __repr__(self):
     def send_message(self, message):
         message_json = {"type": "message", "channel": self.id, "text": message}
         self.server.send_to_websocket(message_json)
-

slackclient/_server.py

@@ -19,6 +19,7 @@ def __init__(self, token, connect=True):
         self.channels = SearchList()
         self.connected = False
         self.pingcounter = 0
+        self.ws_url = None
         self.api_requester = SlackRequest()
 
         if connect:
@@ -119,13 +120,15 @@ def websocket_safe_read(self):
                 raise
             return data.rstrip()
 
-    def attach_user(self, name, id, real_name, tz):
-        if self.users.find(id) is None:
-            self.users.append(User(self, name, id, real_name, tz))
+    def attach_user(self, name, channel_id, real_name, tz):
+        if self.users.find(channel_id) is None:
+            self.users.append(User(self, name, channel_id, real_name, tz))
 
-    def attach_channel(self, name, id, members=[]):
-        if self.channels.find(id) is None:
-            self.channels.append(Channel(self, name, id, members))
+    def attach_channel(self, name, channel_id, members=None):
+        if members is None:
+            members = []
+        if self.channels.find(channel_id) is None:
+            self.channels.append(Channel(self, name, channel_id, members))
 
     def join_channel(self, name):
         print(self.api_requester.do(self.token,

slackclient/_slackrequest.py

@@ -2,7 +2,12 @@
 
 
 class SlackRequest(object):
-    def do(self, token, request="?", post_data={}, domain="slack.com"):
+
+    @staticmethod
+    def do(token, request="?", post_data=None, domain="slack.com"):
+        if post_data is None:
+            post_data = {}
+
         return requests.post(
             'https://{0}/api/{1}'.format(domain, request),
             data=dict(post_data, token=token),

slackclient/_user.py

@@ -1,10 +1,10 @@
 class User(object):
-    def __init__(self, server, name, id, real_name, tz):
+    def __init__(self, server, name, user_id, real_name, tz):
         self.tz = tz
         self.name = name
         self.real_name = real_name
         self.server = server
-        self.id = id
+        self.id = user_id
 
     def __eq__(self, compare_str):
         if self.id == compare_str or self.name == compare_str: