xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update API bindings to support new API URIs.

Browse source 
We also switch the Python client to use a client string of "API: Python"
to allow us to determine more easily which bindings our users are using.

(imported from commit 7216c3d150b371835f14d1bc8d81979a92e44925)
This commit is contained in:
Luke Faraone 2013-03-22 10:29:04 -07:00
parent da880d1015
commit e4f3bf881c
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
humbug/__init__.py
View file

@ -69,7 +69,7 @@ def init_from_options(options):
class Client(object): class Client(object):
def __init__(self, email=None, api_key=None, config_file=None, def __init__(self, email=None, api_key=None, config_file=None,
verbose=False, retry_on_errors=True, verbose=False, retry_on_errors=True,
site=None, client="Python API"): site=None, client="API: Python"):
if None in (api_key, email): if None in (api_key, email):
if config_file is None: if config_file is None:
config_file = os.path.join(os.environ["HOME"], ".humbugrc") config_file = os.path.join(os.environ["HOME"], ".humbugrc")
@ -96,10 +96,8 @@ class Client(object):
self.retry_on_errors = retry_on_errors self.retry_on_errors = retry_on_errors
self.client_name = client self.client_name = client
def do_api_query(self, orig_request, url, longpolling = False): def do_api_query(self, orig_request, url, method="POST", longpolling = False):
request = {} request = {}
request["email"] = self.email
request["api-key"] = self.api_key
request["client"] = self.client_name request["client"] = self.client_name
for (key, val) in orig_request.iteritems(): for (key, val) in orig_request.iteritems():
@ -139,9 +137,13 @@ class Client(object):
while True: while True:
try: try:
res = requests.post(urlparse.urljoin(self.base_url, url), res = requests.request(
data=query_state["request"], method,
verify=True, timeout=55) urlparse.urljoin(self.base_url, url),
auth=requests.auth.HTTPBasicAuth(self.email,
self.api_key),
data=query_state["request"],
verify=True, timeout=55)
# On 50x errors, try again after a short sleep # On 50x errors, try again after a short sleep
if str(res.status_code).startswith('5'): if str(res.status_code).startswith('5'):
@ -186,12 +188,13 @@ class Client(object):
"status_code": res.status_code} "status_code": res.status_code}
@classmethod @classmethod
def _register(cls, name, url=None, make_request=(lambda request={}: request), **query_kwargs): def _register(cls, name, url=None, make_request=(lambda request={}: request),
method="POST", **query_kwargs):
if url is None: if url is None:
url = name url = name
def call(self, *args, **kwargs): def call(self, *args, **kwargs):
request = make_request(*args, **kwargs) request = make_request(*args, **kwargs)
return self.do_api_query(request, API_VERSTRING + url, **query_kwargs) return self.do_api_query(request, API_VERSTRING + url, method=method, **query_kwargs)
call.func_name = name call.func_name = name
setattr(cls, name, call) setattr(cls, name, call)
@ -232,11 +235,14 @@ class Client(object):
def _mk_subs(streams): def _mk_subs(streams):
return {'subscriptions': streams} return {'subscriptions': streams}
Client._register('send_message', make_request=(lambda request: request)) def _mk_del_subs(streams):
Client._register('get_messages', longpolling=True) return {'delete': streams}
Client._register('get_profile')
Client._register('get_public_streams') Client._register('send_message', url='messages', make_request=(lambda request: request))
Client._register('get_members') Client._register('get_messages', method='GET', url='messages/latest', longpolling=True)
Client._register('list_subscriptions', url='subscriptions/list') Client._register('get_profile', method='GET', url='users/me')
Client._register('add_subscriptions', url='subscriptions/add', make_request=_mk_subs) Client._register('get_public_streams', method='GET', url='streams')
Client._register('remove_subscriptions', url='subscriptions/remove', make_request=_mk_subs) Client._register('get_members', method='GET', url='users')
Client._register('list_subscriptions', method='GET', url='users/me/subscriptions')
Client._register('add_subscriptions', url='users/me/subscriptions', make_request=_mk_subs)
Client._register('delete_subscriptions', method='PATCH', url='users/me/subscriptions', make_request=_mk_del_subs)