Skip to content

Moved from urllib to requests #54

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
1 commit merged into from
Feb 21, 2016
Merged

Moved from urllib to requests #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup

setup(name='slackclient',
version='0.16',
version='0.17',
description='Python client for Slack.com',
url='http://github.com/slackhq/python-slackclient',
author='Ryan Huber',
Expand All @@ -10,6 +10,6 @@
packages=['slackclient'],
install_requires=[
'websocket-client',
'future',
'requests',
],
zip_safe=False)
9 changes: 4 additions & 5 deletions slackclient/_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ def __repr__(self):

def rtm_connect(self, reconnect=False):
reply = self.api_requester.do(self.token, "rtm.start")
if reply.code != 200:
if reply.status_code != 200:
raise SlackConnectionError
else:
login_data = json.loads(reply.read().decode('utf-8'))
login_data = reply.json()
if login_data["ok"]:
self.ws_url = login_data['url']
if not reconnect:
Expand Down Expand Up @@ -129,11 +129,10 @@ 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())
"channels.join?name={}".format(name)).text)

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


class SlackConnectionError(Exception):
Expand Down
17 changes: 5 additions & 12 deletions slackclient/_slackrequest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
import time
from future.moves.urllib.parse import urlparse, urlencode
from future.moves.urllib.request import urlopen, Request
from future.moves.urllib.error import HTTPError
import requests


class SlackRequest(object):
def __init__(self):
pass

def do(self, token, request="?", post_data={}, domain="slack.com"):
post_data["token"] = token
post_data = urlencode(post_data)
url = 'https://{}/api/{}'.format(domain, request)
return urlopen(url, post_data.encode('utf-8'))

return requests.post(
'https://{0}/api/{1}'.format(domain, request),
data=dict(post_data, token=token),
)