8000 Return the value of api_call by llimllib · Pull Request #1 · slackapi/python-slack-sdk · GitHub
[go: up one dir, main page]
Skip to content

Return the value of api_call #1

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
rawdigits merged 2 commits into from
Dec 15, 2014
Merged

Return the value of api_call #1

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
8c00768
return value of api_call
llimllib Dec 10, 2014
d73032c
update server to use kwargs
llimllib Dec 10, 2014
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
5 changes: 3 additions & 2 deletions slackclient/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ class SlackClient(object):
def __init__(self, token):
self.token = token
self.server = Server(self.token, False)

def rtm_connect(self):
try:
self.server.rtm_connect()
return True
except:
return False

def api_call(self, method, params={}):
self.server.api_call(method, params)
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
Expand Down
4 changes: 2 additions & 2 deletions slackclient/_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ def attach_channel(self, name, id, members=[]):
def join_channel(self, name):
print self.api_requester.do(self.token, "channels.join?name={}".format(name)).read()

def api_call(self, method, params={}):
reply = self.api_requester.do(self.token, method, params)
def api_call(self, method, **kwargs):
reply = self.api_requester.do(self.token, method, kwargs)
return reply.read()

class SlackConnectionError(Exception):
Expand Down
0