paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

event_queue: Add requests 1.x compatibility.

Browse Source 
The previous version of our code only worked with python-requests <
1.0 (as is the case on our servers), the new version will work with
any python-requests new enough to have a .json at all.

(imported from commit 77ffe3e0d890fe88776c313e0e3289aee1bb30ea)
This commit is contained in:
Tim Abbott
2013-03-29 11:08:24 -04:00
parent 0712cc6279
commit 9d82bb5318
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/humbug/__init__.py
View File

@@ -39,7 +39,7 @@ __version__ = "0.1.5"
# Older versions don't provide the 'json' attribute on responses. # Older versions don't provide the 'json' attribute on responses.
assert(LooseVersion(requests.__version__) >= LooseVersion('0.12.1')) assert(LooseVersion(requests.__version__) >= LooseVersion('0.12.1'))
# In newer versions, the 'json' attribute is a function, not a property # In newer versions, the 'json' attribute is a function, not a property
requests_json_is_function = not isinstance(requests.Response.json, property) requests_json_is_function = callable(requests.Response.json)
API_VERSTRING = "/api/v1/" API_VERSTRING = "/api/v1/"

13
zephyr/lib/event_queue.py
View File

@@ -205,6 +205,15 @@ def setup_event_queue():
# The following functions are called from Django # The following functions are called from Django
# Workaround to support the Python-requests 1.0 transition of .json
# from a property to a function
requests_json_is_function = callable(requests.Response.json)
def extract_json_response(resp):
if requests_json_is_function:
return resp.json()
else:
return resp.json
def request_event_queue(user_profile, apply_markdown, event_types=None): def request_event_queue(user_profile, apply_markdown, event_types=None):
if settings.TORNADO_SERVER: if settings.TORNADO_SERVER:
req = {'dont_block' : 'true', req = {'dont_block' : 'true',
@@ -219,7 +228,7 @@ def request_event_queue(user_profile, apply_markdown, event_types=None):
resp.raise_for_status() resp.raise_for_status()
return resp.json['queue_id'] return extract_json_response(resp)['queue_id']
return None return None
@@ -235,4 +244,4 @@ def get_user_events(user_profile, queue_id, last_event_id):
resp.raise_for_status() resp.raise_for_status()
return resp.json['events'] return extract_json_response(resp)['events']