From 5235ad5416f7be5c8bae87f028905cd4ec2ca4ee Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Fri, 24 Jun 2016 15:51:07 -0700
Subject: [PATCH] urls: Rearrange a few REST URL entries.

---
 zproject/urls.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/zproject/urls.py b/zproject/urls.py
index 9eb2945965..0a5c852957 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -120,13 +120,13 @@ v1_api_and_json_patterns = patterns('zerver.views',
     # zerver.views
     url(r'^export$', 'rest_dispatch',
         {'GET':  'export'}),
+    url(r'^realm$', 'rest_dispatch',
+        {'PATCH': 'update_realm'}),
     url(r'^users/me$', 'rest_dispatch',
         {'GET': 'get_profile_backend'}),
     url(r'^users/me/pointer$', 'rest_dispatch',
         {'GET': 'get_pointer_backend',
          'PUT': 'update_pointer_backend'}),
-    url(r'^realm$', 'rest_dispatch',
-        {'PATCH': 'update_realm'}),
     url(r'^users/me/presence$', 'rest_dispatch',
         {'POST': 'update_active_status_backend'}),
     # Endpoint used by iOS devices to register their
@@ -138,10 +138,6 @@ v1_api_and_json_patterns = patterns('zerver.views',
         {'POST': 'add_android_reg_id',
          'DELETE': 'remove_android_reg_id'}),
 
-    # Used to register for an event queue in tornado
-    url(r'^register$', 'rest_dispatch',
-        {'POST': 'api_events_register'}),
-
     # Returns a 204, used by desktop app to verify connectivity status
     url(r'generate_204$', 'generate_204'),
 ) + patterns('zerver.views.realm_emoji',
@@ -179,6 +175,12 @@ v1_api_and_json_patterns = patterns('zerver.views',
     url(r'^messages/flags$', 'rest_dispatch',
         {'POST':  'update_message_flags'}),
 
+) + patterns('zerver.views.user_settings',
+    url(r'^users/me/api_key/regenerate$', 'rest_dispatch',
+        {'POST': 'regenerate_api_key'}),
+    url(r'^users/me/enter-sends$', 'rest_dispatch',
+        {'POST': 'change_enter_sends'}),
+
 ) + patterns('zerver.views.alert_words',
     url(r'^users/me/alert_words$', 'rest_dispatch',
         {'GET': 'list_alert_words',
@@ -186,12 +188,6 @@ v1_api_and_json_patterns = patterns('zerver.views',
          'PUT': 'add_alert_words',
          'DELETE': 'remove_alert_words'}),
 
-) + patterns('zerver.views.user_settings',
-    url(r'^users/me/api_key/regenerate$', 'rest_dispatch',
-        {'POST': 'regenerate_api_key'}),
-    url(r'^users/me/enter-sends$', 'rest_dispatch',
-        {'POST': 'change_enter_sends'}),
-
 ) + patterns('zerver.views.streams',
     url(r'^streams$', 'rest_dispatch',
         {'GET':  'get_streams_backend'}),
@@ -212,6 +208,11 @@ v1_api_and_json_patterns = patterns('zerver.views',
          'POST': 'add_subscriptions_backend',
          'PATCH': 'update_subscriptions_backend'}),
 
+) + patterns('zerver.views',
+    # Used to register for an event queue in tornado
+    url(r'^register$', 'rest_dispatch',
+        {'POST': 'api_events_register'}),
+
 ) + patterns('zerver.tornadoviews',
     url(r'^events$', 'rest_dispatch',
         {'GET': 'get_events_backend',