diff --git a/common/djangoapps/entitlements/api/urls.py b/common/djangoapps/entitlements/api/urls.py index 3fa0c71d65..3be62023d1 100644 --- a/common/djangoapps/entitlements/api/urls.py +++ b/common/djangoapps/entitlements/api/urls.py @@ -1,5 +1,6 @@ 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 f716d39b9c..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 = '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 7e5f0767ce..0f96b8a8ea 100644 --- a/lms/djangoapps/ccx/api/urls.py +++ b/lms/djangoapps/ccx/api/urls.py @@ -3,6 +3,7 @@ CCX API URLs. """ 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/ccx/api/v0/urls.py b/lms/djangoapps/ccx/api/v0/urls.py index 8a81a1b98c..5b0c982160 100644 --- a/lms/djangoapps/ccx/api/v0/urls.py +++ b/lms/djangoapps/ccx/api/v0/urls.py @@ -8,11 +8,12 @@ from lms.djangoapps.ccx.api.v0 import views CCX_COURSE_ID_PATTERN = settings.COURSE_ID_PATTERN.replace('course_id', 'ccx_course_id') -CCX_URLS = [ +CCX_URLS = ([ url(r'^$', views.CCXListView.as_view(), name='list'), url(r'^{}/?$'.format(CCX_COURSE_ID_PATTERN), views.CCXDetailView.as_view(), name='detail'), -] +], 'ccx') +app_name = 'v0' urlpatterns = [ - url(r'^ccx/', include(CCX_URLS, namespace='ccx')), + url(r'^ccx/', include(CCX_URLS)), ] diff --git a/lms/djangoapps/certificates/apis/urls.py b/lms/djangoapps/certificates/apis/urls.py index 5abcec1f77..d37514a358 100644 --- a/lms/djangoapps/certificates/apis/urls.py +++ b/lms/djangoapps/certificates/apis/urls.py @@ -3,6 +3,7 @@ Certificates API URLs. """ 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 3fe534851c..980dc7136c 100644 --- a/lms/djangoapps/certificates/apis/v0/urls.py +++ b/lms/djangoapps/certificates/apis/v0/urls.py @@ -6,7 +6,7 @@ from django.conf.urls import include, url from lms.djangoapps.certificates.apis.v0 import views -CERTIFICATES_URLS = [ +CERTIFICATES_URLS = ([ url( r'^{username}/courses/{course_id}/$'.format( username=settings.USERNAME_PATTERN, @@ -14,8 +14,9 @@ CERTIFICATES_URLS = [ ), views.CertificatesDetailView.as_view(), name='detail' ), -] +], 'certificates') +app_name = 'v0' urlpatterns = [ - url(r'^certificates/', include(CERTIFICATES_URLS, namespace='certificates')), + url(r'^certificates/', include(CERTIFICATES_URLS)), ] diff --git a/lms/djangoapps/certificates/urls.py b/lms/djangoapps/certificates/urls.py index a0e84ded91..9954a2c39d 100644 --- a/lms/djangoapps/certificates/urls.py +++ b/lms/djangoapps/certificates/urls.py @@ -6,6 +6,7 @@ from django.conf.urls import url from lms.djangoapps.certificates import views +app_name = 'certificates' urlpatterns = [ # Certificates HTML view end point to render web certs by user and course url( diff --git a/lms/djangoapps/commerce/api/urls.py b/lms/djangoapps/commerce/api/urls.py index af1a1dde5b..7915693154 100644 --- a/lms/djangoapps/commerce/api/urls.py +++ b/lms/djangoapps/commerce/api/urls.py @@ -3,7 +3,8 @@ API URLs. """ 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 b6df78845c..c2cacbaa68 100644 --- a/lms/djangoapps/commerce/api/v0/urls.py +++ b/lms/djangoapps/commerce/api/v0/urls.py @@ -5,11 +5,12 @@ from django.conf.urls import include, url from . import views -BASKET_URLS = [ +BASKET_URLS = ([ url(r'^$', views.BasketsView.as_view(), name='create'), url(r'^(?P[\w]+)/order/$', views.BasketOrderView.as_view(), name='retrieve_order'), -] +], 'baskets') +app_name = 'v0' urlpatterns = [ - url(r'^baskets/', include(BASKET_URLS, namespace='baskets')), + 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 88a4de47b5..c9de3059c3 100644 --- a/lms/djangoapps/commerce/api/v1/urls.py +++ b/lms/djangoapps/commerce/api/v1/urls.py @@ -3,16 +3,17 @@ from django.conf.urls import include, url from . import views -COURSE_URLS = [ +COURSE_URLS = ([ url(r'^$', views.CourseListView.as_view(), name='list'), url(r'^{}/$'.format(settings.COURSE_ID_PATTERN), views.CourseRetrieveUpdateView.as_view(), name='retrieve_update'), -] +], 'courses') -ORDER_URLS = [ +ORDER_URLS = ([ url(r'^(?P[-\w]+)/$', views.OrderView.as_view(), name='detail'), -] +], 'orders') +app_name = 'v1' urlpatterns = [ - url(r'^courses/', include(COURSE_URLS, namespace='courses')), - url(r'^orders/', include(ORDER_URLS, namespace='orders')), + url(r'^courses/', include(COURSE_URLS)), + url(r'^orders/', include(ORDER_URLS)), ] diff --git a/lms/djangoapps/commerce/urls.py b/lms/djangoapps/commerce/urls.py index eb0ded876a..248e05aacb 100644 --- a/lms/djangoapps/commerce/urls.py +++ b/lms/djangoapps/commerce/urls.py @@ -5,6 +5,7 @@ from django.conf.urls import url from . import views +app_name = 'commerce' urlpatterns = [ url(r'^checkout/cancel/$', views.checkout_cancel, name='checkout_cancel'), url(r'^checkout/error/$', views.checkout_error, name='checkout_error'), diff --git a/lms/djangoapps/course_goals/urls.py b/lms/djangoapps/course_goals/urls.py index d00976b37a..a914d10915 100644 --- a/lms/djangoapps/course_goals/urls.py +++ b/lms/djangoapps/course_goals/urls.py @@ -9,6 +9,7 @@ from .views import CourseGoalViewSet router = routers.DefaultRouter() router.register(r'course_goals', CourseGoalViewSet, base_name='course_goal') +app_name = 'course_goals' urlpatterns = [ url(r'^v0/', include(router.urls, namespace='v0')), ] diff --git a/lms/djangoapps/experiments/urls.py b/lms/djangoapps/experiments/urls.py index e4b30552ca..7327949692 100644 --- a/lms/djangoapps/experiments/urls.py +++ b/lms/djangoapps/experiments/urls.py @@ -6,6 +6,7 @@ router = routers.DefaultRouter() router.register(r'data', views.ExperimentDataViewSet, base_name='data') router.register(r'key-value', views.ExperimentKeyValueViewSet, base_name='key_value') +app_name = 'experiments' urlpatterns = [ url(r'^v0/', include(router.urls, namespace='v0')), ] diff --git a/lms/djangoapps/rss_proxy/urls.py b/lms/djangoapps/rss_proxy/urls.py index 55e8171ed4..ac7b7a5265 100644 --- a/lms/djangoapps/rss_proxy/urls.py +++ b/lms/djangoapps/rss_proxy/urls.py @@ -5,6 +5,7 @@ from django.conf.urls import url from rss_proxy.views import proxy +app_name = 'rss_proxy' urlpatterns = [ url(r'^$', proxy, name='proxy'), ] diff --git a/lms/djangoapps/support/urls.py b/lms/djangoapps/support/urls.py index a959fe0a04..5f3c8621b4 100644 --- a/lms/djangoapps/support/urls.py +++ b/lms/djangoapps/support/urls.py @@ -13,6 +13,7 @@ from support.views.refund import RefundSupportView COURSE_ENTITLEMENTS_VIEW = EntitlementSupportView.as_view() +app_name = 'support' urlpatterns = [ url(r'^$', index, name="index"), url(r'^certificates/?$', CertificatesSupportView.as_view(), name="certificates"), diff --git a/lms/urls.py b/lms/urls.py index e69c0e95f2..65786b767d 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -119,8 +119,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', app_name='credit', 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')), @@ -184,7 +184,7 @@ if settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD'): ] urlpatterns += [ - url(r'^support/', include('support.urls', app_name='support', namespace='support')), + url(r'^support/', include('support.urls')), ] # Favicon @@ -978,7 +978,7 @@ if settings.FEATURES.get('ENABLE_OAUTH2_PROVIDER'): # Certificates urlpatterns += [ - url(r'^certificates/', include('certificates.urls', app_name='certificates', 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 b7e2a65a50..fed366d8f0 100644 --- a/openedx/core/djangoapps/api_admin/api/urls.py +++ b/openedx/core/djangoapps/api_admin/api/urls.py @@ -3,6 +3,7 @@ URL definitions for api access request API. """ 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 f4176d44eb..50e8d78fdd 100644 --- a/openedx/core/djangoapps/api_admin/api/v1/urls.py +++ b/openedx/core/djangoapps/api_admin/api/v1/urls.py @@ -5,6 +5,7 @@ from django.conf.urls import url from openedx.core.djangoapps.api_admin.api.v1 import views +app_name = 'v1' urlpatterns = [ url(r'^api_access_request/$', views.ApiAccessRequestView.as_view(), name='list_api_access_request'), ] diff --git a/openedx/core/djangoapps/api_admin/urls.py b/openedx/core/djangoapps/api_admin/urls.py index 4728ca8da9..eb3df0990d 100644 --- a/openedx/core/djangoapps/api_admin/urls.py +++ b/openedx/core/djangoapps/api_admin/urls.py @@ -15,6 +15,7 @@ from openedx.core.djangoapps.api_admin.views import ( CatalogSearchView ) +app_name = 'api_admin' urlpatterns = ( url( r'^status/$', diff --git a/openedx/core/djangoapps/catalog/urls.py b/openedx/core/djangoapps/catalog/urls.py index 2090f9956c..8b4a802b07 100644 --- a/openedx/core/djangoapps/catalog/urls.py +++ b/openedx/core/djangoapps/catalog/urls.py @@ -2,6 +2,7 @@ from django.conf.urls import url from . import views +app_name = 'catalog' urlpatterns = [ url(r'^management/cache_programs/$', views.cache_programs, name='cache_programs'), ] diff --git a/openedx/core/djangoapps/credit/urls.py b/openedx/core/djangoapps/credit/urls.py index 23a20ace36..8621edca5f 100644 --- a/openedx/core/djangoapps/credit/urls.py +++ b/openedx/core/djangoapps/credit/urls.py @@ -22,6 +22,7 @@ router.register(r'courses', views.CreditCourseViewSet) router.register(r'providers', views.CreditProviderViewSet) V1_URLS += router.urls +app_name = 'credit' urlpatterns = [ url(r'^v1/', include(V1_URLS)), ] diff --git a/openedx/core/djangoapps/dark_lang/urls.py b/openedx/core/djangoapps/dark_lang/urls.py index b80744b06f..db3a7457c8 100644 --- a/openedx/core/djangoapps/dark_lang/urls.py +++ b/openedx/core/djangoapps/dark_lang/urls.py @@ -6,6 +6,7 @@ from django.conf.urls import url from openedx.core.djangoapps.dark_lang import views +app_name = 'dark_lang' urlpatterns = [ url(r'^$', views.PreviewLanguageFragmentView.as_view(), name='preview_lang'), ] diff --git a/openedx/core/djangoapps/embargo/urls.py b/openedx/core/djangoapps/embargo/urls.py index e8c8072dac..83baab424f 100644 --- a/openedx/core/djangoapps/embargo/urls.py +++ b/openedx/core/djangoapps/embargo/urls.py @@ -4,6 +4,7 @@ from django.conf.urls import url from .views import CheckCourseAccessView, CourseAccessMessageView +app_name = 'embargo' urlpatterns = [ url( r'^blocked-message/(?Penrollment|courseware)/(?P.+)/$',