Skip to content

make objects python3 compatible #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yasumoto merged 2 commits into from
Jul 6, 2016
Merged

make objects python3 compatible #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72affb5
make objects python3 compatible
Jul 6, 2016
dc8c486
Rename tests to better show their purpose
Jul 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions slackclient/_channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()):
Expand Down
3 changes: 3 additions & 0 deletions slackclient/_im.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()):
Expand Down
3 changes: 3 additions & 0 deletions slackclient/_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()):
Expand Down
3 changes: 3 additions & 0 deletions slackclient/_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()):
Expand Down
10 changes: 10 additions & 0 deletions tests/test_channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ def test_channel_eq(channel):
assert channel == 'C12345678'
assert (channel == 'foo') is False

def test_channel_is_hashable(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')
6 changes: 6 additions & 0 deletions tests/test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ def test_Server(server):
assert type(server) == Server


def test_Server_is_hashable(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
Expand Down