From d77c70220c91a47b06695409e178bb006fe996e8 Mon Sep 17 00:00:00 2001
From: Conrad Dean <conrad.p.dean@gmail.com>
Date: Sun, 5 Jun 2016 15:32:00 -0400
Subject: [PATCH] send_event: Remove useless return value and annotate.

Detected by mypy.

[tweaked by tabbott to pass mypy check and remove annotations]
---
 zerver/lib/event_queue.py | 15 ++++++++++-----
 zerver/lib/queue.py       |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/zerver/lib/event_queue.py b/zerver/lib/event_queue.py
index 217ed2ee8d..944dd123e3 100644
--- a/zerver/lib/event_queue.py
+++ b/zerver/lib/event_queue.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import
-from typing import Any
+from typing import Any, Dict, Iterable, Union
 
 from django.utils.translation import ugettext as _
 from django.conf import settings
@@ -760,9 +760,14 @@ def send_notification_http(data):
         process_notification(data)
 
 def send_notification(data):
-    return queue_json_publish("notify_tornado", data, send_notification_http)
+    # type: (Dict[str, Any]) -> None
+    queue_json_publish("notify_tornado", data, send_notification_http)
 
 def send_event(event, users):
-    return queue_json_publish("notify_tornado",
-                              dict(event=event, users=users),
-                              send_notification_http)
+    # type: (Dict[str, Any], Union[Iterable[int], Iterable[Dict[str, Any]]]) -> None
+    """`users` is a list of user IDs, or in the case of `message` type
+    events, a list of dicts describing the users and metadata about
+    the user/message pair."""
+    queue_json_publish("notify_tornado",
+                       dict(event=event, users=users),
+                       send_notification_http)
diff --git a/zerver/lib/queue.py b/zerver/lib/queue.py
index c08d8dec73..f54637757e 100644
--- a/zerver/lib/queue.py
+++ b/zerver/lib/queue.py
@@ -94,12 +94,12 @@ class SimpleQueueClient(object):
 
     def json_publish(self, queue_name, body):
         try:
-            return self.publish(queue_name, ujson.dumps(body))
+            self.publish(queue_name, ujson.dumps(body))
         except (AttributeError, pika.exceptions.AMQPConnectionError):
             self.log.warning("Failed to send to rabbitmq, trying to reconnect and send again")
             self._reconnect()
 
-            return self.publish(queue_name, ujson.dumps(body))
+            self.publish(queue_name, ujson.dumps(body))
 
     def register_consumer(self, queue_name, consumer):
         def wrapped_consumer(ch, method, properties, body):