make objects python3 compatible

Shashank Bhargava · Shashank Bhargava · commit 72affb5cea95 · 2016-07-05T18:50:16.000-07:00
diff --git a/slackclient/_channel.py b/slackclient/_channel.py
@@ -11,6 +11,9 @@ def __eq__(self, compare_str):
         else:
             return False
 
+    def __hash__(self):
+        return hash(self.id)
+
     def __str__(self):
         data = ""
         for key in list(self.__dict__.keys()):
diff --git a/slackclient/_im.py b/slackclient/_im.py
@@ -10,6 +10,9 @@ def __eq__(self, compare_str):
         else:
             return False
 
+    def __hash__(self):
+        return hash(self.id)
+
     def __str__(self):
         data = ""
         for key in list(self.__dict__.keys()):
diff --git a/slackclient/_server.py b/slackclient/_server.py
@@ -31,6 +31,9 @@ def __eq__(self, compare_str):
         else:
             return False
 
+    def __hash__(self):
+        return hash(self.token)
+
     def __str__(self):
         data = ""
         for key in list(self.__dict__.keys()):
diff --git a/slackclient/_user.py b/slackclient/_user.py
@@ -12,6 +12,9 @@ def __eq__(self, compare_str):
         else:
             return False
 
+    def __hash__(self):
+        return hash(self.id)
+
     def __str__(self):
         data = ""
         for key in list(self.__dict__.keys()):
diff --git a/tests/test_channel.py b/tests/test_channel.py
@@ -16,6 +16,16 @@ def test_channel_eq(channel):
     assert channel == 'C12345678'
     assert (channel == 'foo') is False
 
+def test_channel_hash(channel):
+    channel = Channel(
+        'test-server',
+        'test-channel',
+        'C12345678',
+    )
+    channel_map = {channel: channel.id}
+    assert channel_map[channel] == 'C12345678'
+    assert (channel_map[channel] == 'foo') is False
+
 @pytest.mark.xfail
 def test_channel_send_message(channel):
     channel.send_message('hi')
diff --git a/tests/test_server.py b/tests/test_server.py
@@ -16,6 +16,12 @@ def test_Server(server):
     assert type(server) == Server
 
 
+def test_Server_hash(server):
+    server_map = {server: server.token}
+    assert server_map[server] == 'xoxp-1234123412341234-12341234-1234'
+    assert (server_map[server] == 'foo') is False
+
+
 def test_Server_parse_channel_data(server, login_fixture):
     server.parse_channel_data(login_fixture["channels"])
     assert type(server.channels.find('general')) == Channel
