From bf50dd7771f8095fe17215a3efc5f297f409b5f2 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Tue, 26 Apr 2016 21:33:37 -0700
Subject: [PATCH] Simplify zilencer urls.py configuration to a single file.

The previous separated-out configuration wasn't helping us, and this
makes it easier to make the extra installed applications pluggable in
the following commits.
---
 zilencer/urls.py          | 24 ++++++++++++++++++++++++
 zilencer/urls/__init__.py |  0
 zilencer/urls/api.py      |  9 ---------
 zilencer/urls/pages.py    |  9 ---------
 zproject/urls.py          |  7 +------
 5 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 zilencer/urls.py
 delete mode 100644 zilencer/urls/__init__.py
 delete mode 100644 zilencer/urls/api.py
 delete mode 100644 zilencer/urls/pages.py

diff --git a/zilencer/urls.py b/zilencer/urls.py
new file mode 100644
index 0000000000..179bf364d9
--- /dev/null
+++ b/zilencer/urls.py
@@ -0,0 +1,24 @@
+from django.conf.urls import patterns, url, include
+
+urlpatterns = patterns('zilencer.views',
+    # SSO dispatch page for desktop app with SSO
+    # Allows the user to enter their email address only,
+    # and then redirects the user to the proper deployment
+    # SSO-login page
+    url(r'^accounts/deployment_dispatch$', 'account_deployment_dispatch',
+        {'template_name': 'zerver/login.html'}),
+)
+
+# Zilencer views following the REST API style
+v1_api_and_json_patterns = patterns('zilencer.views',
+    url('^feedback$', 'rest_dispatch',
+          {'POST': 'submit_feedback'}),
+    url('^report_error$', 'rest_dispatch',
+          {'POST': 'report_error'}),
+    url('^endpoints$', 'lookup_endpoints_for_user'),
+)
+
+urlpatterns += patterns('',
+    url(r'^api/v1/', include(v1_api_and_json_patterns)),
+    url(r'^json/', include(v1_api_and_json_patterns)),
+)
diff --git a/zilencer/urls/__init__.py b/zilencer/urls/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/zilencer/urls/api.py b/zilencer/urls/api.py
deleted file mode 100644
index b550d4f479..0000000000
--- a/zilencer/urls/api.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from django.conf.urls import patterns, url, include
-
-urlpatterns = patterns('zilencer.views',
-    url('^feedback$', 'rest_dispatch',
-          {'POST': 'submit_feedback'}),
-    url('^report_error$', 'rest_dispatch',
-          {'POST': 'report_error'}),
-    url('^endpoints$', 'lookup_endpoints_for_user'),
-)
diff --git a/zilencer/urls/pages.py b/zilencer/urls/pages.py
deleted file mode 100644
index 5b1eff4d7e..0000000000
--- a/zilencer/urls/pages.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from django.conf.urls import patterns, url, include
-
-urlpatterns = patterns('zilencer.views',
-    # SSO dispatch page for desktop app with SSO
-    # Allows the user to enter their email address only,
-    # and then redirects the user to the proper deployment
-    # SSO-login page
-    url(r'^accounts/deployment_dispatch$', 'account_deployment_dispatch', {'template_name': 'zerver/login.html'}),
-)
diff --git a/zproject/urls.py b/zproject/urls.py
index f7de739c69..f91ae35e39 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -262,13 +262,8 @@ v1_api_and_json_patterns = patterns('zerver.views',
          'DELETE': 'cleanup_event_queue'}),
 )
 if not settings.VOYAGER:
-    v1_api_and_json_patterns += patterns('',
-        # Still scoped to api/v1/, but under a different project
-        url(r'^deployments/', include('zilencer.urls.api')),
-    )
-
     urlpatterns += patterns('',
-        url(r'^', include('zilencer.urls.pages')),
+        url(r'^', include('zilencer.urls')),
     )
 
     urlpatterns += patterns('',