From e5ee0fc91f967b2f894610bf778811b0b311d516 Mon Sep 17 00:00:00 2001
From: John Eskew <jeskew@edx.org>
Date: Mon, 7 May 2018 14:06:45 -0400
Subject: [PATCH] Remove more unneeded 'namespace=' params.

---
 common/djangoapps/entitlements/api/urls.py       | 2 +-
 common/djangoapps/entitlements/api/v1/urls.py    | 2 +-
 lms/djangoapps/ccx/api/urls.py                   | 2 +-
 lms/djangoapps/certificates/apis/urls.py         | 2 +-
 lms/djangoapps/certificates/apis/v0/urls.py      | 4 ++--
 lms/djangoapps/commerce/api/urls.py              | 4 ++--
 lms/djangoapps/commerce/api/v0/urls.py           | 2 +-
 lms/djangoapps/commerce/api/v1/urls.py           | 2 +-
 lms/urls.py                                      | 8 ++++----
 openedx/core/djangoapps/api_admin/api/urls.py    | 2 +-
 openedx/core/djangoapps/api_admin/api/v1/urls.py | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/djangoapps/entitlements/api/urls.py b/common/djangoapps/entitlements/api/urls.py
index d2342effa7..3be62023d1 100644
--- a/common/djangoapps/entitlements/api/urls.py
+++ b/common/djangoapps/entitlements/api/urls.py
@@ -2,5 +2,5 @@ from django.conf.urls import include, url
 
 app_name = 'entitlements'
 urlpatterns = [
-    url(r'^v1/', include('entitlements.api.v1.urls', namespace='v1')),
+    url(r'^v1/', include('entitlements.api.v1.urls')),
 ]
diff --git a/common/djangoapps/entitlements/api/v1/urls.py b/common/djangoapps/entitlements/api/v1/urls.py
index 975a62f3fe..a96b2cd805 100644
--- a/common/djangoapps/entitlements/api/v1/urls.py
+++ b/common/djangoapps/entitlements/api/v1/urls.py
@@ -11,7 +11,7 @@ ENROLLMENTS_VIEW = EntitlementEnrollmentViewSet.as_view({
     'delete': 'destroy',
 })
 
-app_name = 'entitlements'
+app_name = 'v1'
 urlpatterns = [
     url(r'', include(router.urls)),
     url(
diff --git a/lms/djangoapps/ccx/api/urls.py b/lms/djangoapps/ccx/api/urls.py
index b2b2fd7a26..0f96b8a8ea 100644
--- a/lms/djangoapps/ccx/api/urls.py
+++ b/lms/djangoapps/ccx/api/urls.py
@@ -5,5 +5,5 @@ from django.conf.urls import include, url
 
 app_name = 'ccx_api'
 urlpatterns = [
-    url(r'^v0/', include('lms.djangoapps.ccx.api.v0.urls', namespace='v0')),
+    url(r'^v0/', include('lms.djangoapps.ccx.api.v0.urls')),
 ]
diff --git a/lms/djangoapps/certificates/apis/urls.py b/lms/djangoapps/certificates/apis/urls.py
index 84fe4365ef..d37514a358 100644
--- a/lms/djangoapps/certificates/apis/urls.py
+++ b/lms/djangoapps/certificates/apis/urls.py
@@ -5,5 +5,5 @@ from django.conf.urls import include, url
 
 app_name = 'certificates'
 urlpatterns = [
-    url(r'^v0/', include('lms.djangoapps.certificates.apis.v0.urls', namespace='v0')),
+    url(r'^v0/', include('lms.djangoapps.certificates.apis.v0.urls')),
 ]
diff --git a/lms/djangoapps/certificates/apis/v0/urls.py b/lms/djangoapps/certificates/apis/v0/urls.py
index cb22fdacbd..980dc7136c 100644
--- a/lms/djangoapps/certificates/apis/v0/urls.py
+++ b/lms/djangoapps/certificates/apis/v0/urls.py
@@ -16,7 +16,7 @@ CERTIFICATES_URLS = ([
     ),
 ], 'certificates')
 
-app_name = 'certificates'
+app_name = 'v0'
 urlpatterns = [
-    url(r'^certificates/', include(CERTIFICATES_URLS, namespace='certificates')),
+    url(r'^certificates/', include(CERTIFICATES_URLS)),
 ]
diff --git a/lms/djangoapps/commerce/api/urls.py b/lms/djangoapps/commerce/api/urls.py
index 3aba339a35..7915693154 100644
--- a/lms/djangoapps/commerce/api/urls.py
+++ b/lms/djangoapps/commerce/api/urls.py
@@ -5,6 +5,6 @@ from django.conf.urls import include, url
 
 app_name = 'commerce'
 urlpatterns = [
-    url(r'^v0/', include('lms.djangoapps.commerce.api.v0.urls', namespace='v0')),
-    url(r'^v1/', include('lms.djangoapps.commerce.api.v1.urls', namespace='v1')),
+    url(r'^v0/', include('lms.djangoapps.commerce.api.v0.urls')),
+    url(r'^v1/', include('lms.djangoapps.commerce.api.v1.urls')),
 ]
diff --git a/lms/djangoapps/commerce/api/v0/urls.py b/lms/djangoapps/commerce/api/v0/urls.py
index 8d3b098957..c2cacbaa68 100644
--- a/lms/djangoapps/commerce/api/v0/urls.py
+++ b/lms/djangoapps/commerce/api/v0/urls.py
@@ -10,7 +10,7 @@ BASKET_URLS = ([
     url(r'^(?P<basket_id>[\w]+)/order/$', views.BasketOrderView.as_view(), name='retrieve_order'),
 ], 'baskets')
 
-app_name = 'commerce'
+app_name = 'v0'
 urlpatterns = [
     url(r'^baskets/', include(BASKET_URLS)),
 ]
diff --git a/lms/djangoapps/commerce/api/v1/urls.py b/lms/djangoapps/commerce/api/v1/urls.py
index 0285c9b03c..c9de3059c3 100644
--- a/lms/djangoapps/commerce/api/v1/urls.py
+++ b/lms/djangoapps/commerce/api/v1/urls.py
@@ -12,7 +12,7 @@ ORDER_URLS = ([
     url(r'^(?P<number>[-\w]+)/$', views.OrderView.as_view(), name='detail'),
 ], 'orders')
 
-app_name = 'commerce'
+app_name = 'v1'
 urlpatterns = [
     url(r'^courses/', include(COURSE_URLS)),
     url(r'^orders/', include(ORDER_URLS)),
diff --git a/lms/urls.py b/lms/urls.py
index b24eb62380..02d1406042 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -112,8 +112,8 @@ urlpatterns = [
     url(r'^api/val/v0/', include('edxval.urls')),
 
     url(r'^api/commerce/', include('commerce.api.urls', namespace='commerce_api')),
-    url(r'^api/credit/', include('openedx.core.djangoapps.credit.urls', namespace='credit')),
-    url(r'^rss_proxy/', include('rss_proxy.urls', namespace='rss_proxy')),
+    url(r'^api/credit/', include('openedx.core.djangoapps.credit.urls')),
+    url(r'^rss_proxy/', include('rss_proxy.urls')),
     url(r'^api/organizations/', include('organizations.urls', namespace='organizations')),
 
     url(r'^catalog/', include('openedx.core.djangoapps.catalog.urls', namespace='catalog')),
@@ -177,7 +177,7 @@ if settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD'):
     ]
 
 urlpatterns += [
-    url(r'^support/', include('support.urls', namespace='support')),
+    url(r'^support/', include('support.urls')),
 ]
 
 # Favicon
@@ -971,7 +971,7 @@ if settings.FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
 
 # Certificates
 urlpatterns += [
-    url(r'^certificates/', include('certificates.urls', namespace='certificates')),
+    url(r'^certificates/', include('certificates.urls')),
 
     # Backwards compatibility with XQueue, which uses URLs that are not prefixed with /certificates/
     url(r'^update_certificate$', certificates_views.update_certificate, name='update_certificate'),
diff --git a/openedx/core/djangoapps/api_admin/api/urls.py b/openedx/core/djangoapps/api_admin/api/urls.py
index 96a6518a23..fed366d8f0 100644
--- a/openedx/core/djangoapps/api_admin/api/urls.py
+++ b/openedx/core/djangoapps/api_admin/api/urls.py
@@ -5,5 +5,5 @@ from django.conf.urls import include, url
 
 app_name = 'api_admin'
 urlpatterns = [
-    url(r'^v1/', include('openedx.core.djangoapps.api_admin.api.v1.urls', namespace='v1')),
+    url(r'^v1/', include('openedx.core.djangoapps.api_admin.api.v1.urls')),
 ]
diff --git a/openedx/core/djangoapps/api_admin/api/v1/urls.py b/openedx/core/djangoapps/api_admin/api/v1/urls.py
index 9725b75ec9..50e8d78fdd 100644
--- a/openedx/core/djangoapps/api_admin/api/v1/urls.py
+++ b/openedx/core/djangoapps/api_admin/api/v1/urls.py
@@ -5,7 +5,7 @@ from django.conf.urls import url
 
 from openedx.core.djangoapps.api_admin.api.v1 import views
 
-app_name = 'api_admin'
+app_name = 'v1'
 urlpatterns = [
     url(r'^api_access_request/$', views.ApiAccessRequestView.as_view(), name='list_api_access_request'),
 ]