From 1cbc86499e28130be402cf36b335875c2688fd3d Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Sun, 19 Feb 2017 22:53:47 -0800
Subject: [PATCH] events_register: Eliminate unnecessary api_events_register
 wrapper.

---
 zerver/views/events_register.py | 15 +++------------
 zproject/urls.py                |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/zerver/views/events_register.py b/zerver/views/events_register.py
index da9a3e40a6..96ecbdf0ff 100644
--- a/zerver/views/events_register.py
+++ b/zerver/views/events_register.py
@@ -24,19 +24,10 @@ def _default_narrow(user_profile, narrow):
         narrow = [['stream', default_stream.name]]
     return narrow
 
-# Does not need to be authenticated because it's called from rest_dispatch
 @has_request_variables
-def api_events_register(request, user_profile,
-                        apply_markdown=REQ(default=False, validator=check_bool),
-                        all_public_streams=REQ(default=None, validator=check_bool)):
-    # type: (HttpRequest, UserProfile, bool, Optional[bool]) -> HttpResponse
-    return events_register_backend(request, user_profile,
-                                   apply_markdown=apply_markdown,
-                                   all_public_streams=all_public_streams)
-
-@has_request_variables
-def events_register_backend(request, user_profile, apply_markdown=True,
-                            all_public_streams=None,
+def events_register_backend(request, user_profile,
+                            apply_markdown=REQ(default=False, validator=check_bool),
+                            all_public_streams=REQ(default=None, validator=check_bool),
                             event_types=REQ(validator=check_list(check_string), default=None),
                             narrow=REQ(validator=check_list(check_list(check_string, length=2)), default=[]),
                             queue_lifespan_secs=REQ(converter=int, default=0)):
diff --git a/zproject/urls.py b/zproject/urls.py
index 8adc36d161..3383a18176 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -327,7 +327,7 @@ v1_api_and_json_patterns = [
 
     # used to register for an event queue in tornado
     url(r'^register$', rest_dispatch,
-        {'POST': 'zerver.views.events_register.api_events_register'}),
+        {'POST': 'zerver.views.events_register.events_register_backend'}),
 
     # events -> zerver.tornado.views
     url(r'^events$', rest_dispatch,