Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

event_queue: Clean up type ignores. 

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-08-09 15:30:34 -07:00 committed by Tim Abbott
parent 7cd11d0559
commit 7bf09067d1
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zerver/tornado/event_queue.py
View File

@ -578,15 +578,6 @@ def fetch_events(query: Mapping[str, Any]) -> Dict[str, Any]:
# 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: requests.Response) -> Dict[str, Any]:
if requests_json_is_function:
return resp.json()
else:
return resp.json # type: ignore # mypy trusts the stub, not the runtime type checking of this fn
def request_event_queue(user_profile: UserProfile, user_client: Client, apply_markdown: bool,
client_gravatar: bool, queue_lifespan_secs: int,
event_types: Optional[Iterable[str]]=None,
@ -620,11 +611,11 @@ def request_event_queue(user_profile: UserProfile, user_client: Client, apply_ma
resp.raise_for_status()
return extract_json_response(resp)['queue_id']
return resp.json()['queue_id']
return None
def get_user_events(user_profile: UserProfile, queue_id: str, last_event_id: int) -> List[Dict[Any, Any]]:
def get_user_events(user_profile: UserProfile, queue_id: str, last_event_id: int) -> List[Dict[str, Any]]:
if settings.TORNADO_SERVER:
tornado_uri = get_tornado_uri(user_profile.realm)
post_data = {
@ -639,7 +630,7 @@ def get_user_events(user_profile: UserProfile, queue_id: str, last_event_id: int
data=post_data)
resp.raise_for_status()
return extract_json_response(resp)['events']
return resp.json()['events']
return []
# Send email notifications to idle users