Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22891 from edx/BOM-1148

Browse Source 
Added the app_name to URL inclusions to remove warnings - BOM-1148
This commit is contained in:
Aarif
2020-01-22 12:50:36 +05:00
committed by GitHub
parent 2aeec06589 38493d5092
commit fd8c8f09e1
5 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/course_goals/urls.py
View File

@@ -11,7 +11,6 @@ from .views import CourseGoalViewSet
router = routers.DefaultRouter() router = routers.DefaultRouter()
router.register(r'course_goals', CourseGoalViewSet, base_name='course_goal') router.register(r'course_goals', CourseGoalViewSet, base_name='course_goal')
app_name = 'course_goals'
urlpatterns = [ urlpatterns = [
url(r'^v0/', include(router.urls, namespace='v0')), url(r'^v0/', include((router.urls, "api"), namespace='v0')),
] ]

4
lms/djangoapps/experiments/urls.py
View File

@@ -11,9 +11,7 @@ router = routers.DefaultRouter()
router.register(r'data', views.ExperimentDataViewSet, base_name='data') router.register(r'data', views.ExperimentDataViewSet, base_name='data')
router.register(r'key-value', views.ExperimentKeyValueViewSet, base_name='key_value') router.register(r'key-value', views.ExperimentKeyValueViewSet, base_name='key_value')
app_name = 'lms.djangoapps.experiments'
urlpatterns = [ urlpatterns = [
url(r'^v0/custom/REV-934/', views_custom.Rev934.as_view(), name='rev_934'), url(r'^v0/custom/REV-934/', views_custom.Rev934.as_view(), name='rev_934'),
url(r'^v0/', include(router.urls, namespace='v0')), url(r'^v0/', include((router.urls, "api"), namespace='v0')),
] ]

49
lms/urls.py
View File

@@ -93,7 +93,8 @@ urlpatterns = [
url(r'^api/enrollment/v1/', include('openedx.core.djangoapps.enrollments.urls')), url(r'^api/enrollment/v1/', include('openedx.core.djangoapps.enrollments.urls')),
# Entitlement API RESTful endpoints # Entitlement API RESTful endpoints
url(r'^api/entitlements/', include('entitlements.api.urls', namespace='entitlements_api')), url(r'^api/entitlements/', include(('entitlements.api.urls', 'common.djangoapps.entitlements'),
namespace='entitlements_api')),
# Courseware search endpoints # Courseware search endpoints
url(r'^search/', include('search.urls')), url(r'^search/', include('search.urls')),
@@ -115,33 +116,38 @@ urlpatterns = [
# independently of courseware. https://github.com/edx/edx-val # independently of courseware. https://github.com/edx/edx-val
url(r'^api/val/v0/', include('edxval.urls')), url(r'^api/val/v0/', include('edxval.urls')),
url(r'^api/commerce/', include('commerce.api.urls', namespace='commerce_api')), url(r'^api/commerce/', include(('commerce.api.urls', 'lms.djangoapps.commerce'), namespace='commerce_api')),
url(r'^api/credit/', include('openedx.core.djangoapps.credit.urls')), url(r'^api/credit/', include('openedx.core.djangoapps.credit.urls')),
url(r'^rss_proxy/', include('rss_proxy.urls')), url(r'^rss_proxy/', include('rss_proxy.urls')),
url(r'^api/organizations/', include('organizations.urls', namespace='organizations')), url(r'^api/organizations/', include('organizations.urls', namespace='organizations')),
url(r'^catalog/', include('openedx.core.djangoapps.catalog.urls', namespace='catalog')), url(r'^catalog/', include(('openedx.core.djangoapps.catalog.urls', 'openedx.core.djangoapps.catalog'),
namespace='catalog')),
# Update session view # Update session view
url(r'^lang_pref/session_language', lang_pref_views.update_session_language, name='session_language'), url(r'^lang_pref/session_language', lang_pref_views.update_session_language, name='session_language'),
# Multiple course modes and identity verification # Multiple course modes and identity verification
url(r'^course_modes/', include('course_modes.urls')), url(r'^course_modes/', include('course_modes.urls')),
url(r'^api/course_modes/', include('course_modes.api.urls', namespace='course_modes_api')), url(r'^api/course_modes/', include(('course_modes.api.urls', 'common.djangoapps.course_mods'),
namespace='course_modes_api')),
url(r'^verify_student/', include('verify_student.urls')), url(r'^verify_student/', include('verify_student.urls')),
# URLs for managing dark launches of languages # URLs for managing dark launches of languages
url(r'^update_lang/', include('openedx.core.djangoapps.dark_lang.urls', namespace='dark_lang')), url(r'^update_lang/', include(('openedx.core.djangoapps.dark_lang.urls', 'openedx.core.djangoapps.dark_lang'),
namespace='dark_lang')),
# For redirecting to help pages. # For redirecting to help pages.
url(r'^help_token/', include('help_tokens.urls')), url(r'^help_token/', include('help_tokens.urls')),
# URLs for API access management # URLs for API access management
url(r'^api-admin/', include('openedx.core.djangoapps.api_admin.urls', namespace='api_admin')), url(r'^api-admin/', include(('openedx.core.djangoapps.api_admin.urls', 'openedx.core.djangoapps.api_admin'),
namespace='api_admin')),
url(r'^dashboard/', include('learner_dashboard.urls')), url(r'^dashboard/', include('learner_dashboard.urls')),
url(r'^api/experiments/', include('experiments.urls', namespace='api_experiments')), url(r'^api/experiments/', include(('experiments.urls', 'lms.djangoapps.experiments'), namespace='api_experiments')),
url(r'^api/discounts/', include('openedx.features.discounts.urls', namespace='api_discounts')), url(r'^api/discounts/', include(('openedx.features.discounts.urls', 'openedx.features.discounts'),
namespace='api_discounts')),
] ]
if settings.FEATURES.get('ENABLE_MOBILE_REST_API'): if settings.FEATURES.get('ENABLE_MOBILE_REST_API'):
@@ -277,7 +283,8 @@ urlpatterns += [
), ),
# New (Blockstore-based) XBlock REST API # New (Blockstore-based) XBlock REST API
url(r'', include('openedx.core.djangoapps.xblock.rest_api.urls', namespace='xblock_api')), url(r'', include(('openedx.core.djangoapps.xblock.rest_api.urls', 'openedx.core.djangoapps.xblock'),
namespace='xblock_api')),
url( url(
r'^courses/{}/xqueue/(?P<userid>[^/]*)/(?P<mod_id>.*?)/(?P<dispatch>[^/]*)$'.format( r'^courses/{}/xqueue/(?P<userid>[^/]*)/(?P<mod_id>.*?)/(?P<dispatch>[^/]*)$'.format(
@@ -524,7 +531,9 @@ urlpatterns += [
), ),
# Cohorts management API # Cohorts management API
url(r'^api/cohorts/', include('openedx.core.djangoapps.course_groups.urls', namespace='api_cohorts')), url(r'^api/cohorts/', include(
('openedx.core.djangoapps.course_groups.urls', 'openedx.core.djangoapps.course_groups'),
namespace='api_cohorts')),
# Cohorts management # Cohorts management
url( url(
@@ -786,19 +795,22 @@ if configuration_helpers.get_value('ENABLE_BULK_ENROLLMENT_VIEW', settings.FEATU
# Shopping cart # Shopping cart
urlpatterns += [ urlpatterns += [
url(r'^shoppingcart/', include('shoppingcart.urls')), url(r'^shoppingcart/', include('shoppingcart.urls')),
url(r'^commerce/', include('lms.djangoapps.commerce.urls', namespace='commerce')), url(r'^commerce/', include(('lms.djangoapps.commerce.urls', 'lms.djangoapps.commerce'), namespace='commerce')),
] ]
# Course goals # Course goals
urlpatterns += [ urlpatterns += [
url(r'^api/course_goals/', include('lms.djangoapps.course_goals.urls', namespace='course_goals_api')), url(r'^api/course_goals/', include(('lms.djangoapps.course_goals.urls', 'lms.djangoapps.course_goals'),
namespace='course_goals_api')),
] ]
# Embargo # Embargo
if settings.FEATURES.get('EMBARGO'): if settings.FEATURES.get('EMBARGO'):
urlpatterns += [ urlpatterns += [
url(r'^embargo/', include('openedx.core.djangoapps.embargo.urls', namespace='embargo')), url(r'^embargo/', include(('openedx.core.djangoapps.embargo.urls', 'openedx.core.djangoapps.embargo'),
url(r'^api/embargo/', include('openedx.core.djangoapps.embargo.urls', namespace='api_embargo')), namespace='embargo')),
url(r'^api/embargo/', include(('openedx.core.djangoapps.embargo.urls', 'openedx.core.djangoapps.embargo'),
namespace='api_embargo')),
] ]
# Survey Djangoapp # Survey Djangoapp
@@ -814,11 +826,11 @@ if settings.FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
# These URLs contain the django-oauth2-provider default behavior. It exists to provide # These URLs contain the django-oauth2-provider default behavior. It exists to provide
# URLs for django-oauth2-provider to call using reverse() with the oauth2 namespace, and # URLs for django-oauth2-provider to call using reverse() with the oauth2 namespace, and
# also to maintain support for views that have not yet been wrapped in dispatch views. # also to maintain support for views that have not yet been wrapped in dispatch views.
url(r'^oauth2/', include('edx_oauth2_provider.urls', namespace='oauth2')), url(r'^oauth2/', include(('edx_oauth2_provider.urls', 'edx_oauth2_provider'), namespace='oauth2')),
# The /_o/ prefix exists to provide a target for code in django-oauth-toolkit that # The /_o/ prefix exists to provide a target for code in django-oauth-toolkit that
# uses reverse() with the 'oauth2_provider' namespace. Developers should not access these # uses reverse() with the 'oauth2_provider' namespace. Developers should not access these
# views directly, but should rather use the wrapped views at /oauth2/ # views directly, but should rather use the wrapped views at /oauth2/
url(r'^_o/', include('oauth2_provider.urls', namespace='oauth2_provider')), url(r'^_o/', include(('oauth2_provider.urls', 'edx_oauth2_provider'), namespace='oauth2_provider')),
] ]
if settings.FEATURES.get('ENABLE_SQL_TRACKING_LOGS'): if settings.FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
@@ -887,7 +899,8 @@ urlpatterns += [
# REST APIs # REST APIs
url(r'^api/certificates/', url(r'^api/certificates/',
include('lms.djangoapps.certificates.apis.urls', namespace='certificates_api')), include(('lms.djangoapps.certificates.apis.urls', 'lms.djangoapps.certificates'),
namespace='certificates_api')),
] ]
# XDomain proxy # XDomain proxy
@@ -900,7 +913,7 @@ if settings.FEATURES.get('CUSTOM_COURSES_EDX'):
urlpatterns += [ urlpatterns += [
url(r'^courses/{}/'.format(settings.COURSE_ID_PATTERN), url(r'^courses/{}/'.format(settings.COURSE_ID_PATTERN),
include('ccx.urls')), include('ccx.urls')),
url(r'^api/ccx/', include('lms.djangoapps.ccx.api.urls', namespace='ccx_api')), url(r'^api/ccx/', include(('lms.djangoapps.ccx.api.urls', 'lms.djangoapps.ccx'), namespace='ccx_api')),
] ]
# Access to courseware as an LTI provider # Access to courseware as an LTI provider

28
openedx/core/djangoapps/plugins/plugin_urls.py
View File

@@ -6,22 +6,26 @@ from . import constants, registry, utils
log = getLogger(__name__) log = getLogger(__name__)
def get_url(url_module_path, url_config):
"""
function constructs the appropriate URL
"""
namespace = url_config[constants.PluginURLs.NAMESPACE]
app_name = url_config.get(constants.PluginURLs.APP_NAME)
regex = url_config.get(constants.PluginURLs.REGEX, r'')
if namespace:
return url(regex, include((url_module_path, app_name), namespace=namespace))
else:
return url(regex, include(url_module_path))
def get_patterns(project_type): def get_patterns(project_type):
""" """
Returns a list of all registered Plugin URLs, expected to be added to Returns a list of all registered Plugin URLs, expected to be added to
the URL patterns for the given project_type. the URL patterns for the given project_type.
""" """
return [ return [get_url(url_module_path, url_config) for url_module_path, url_config in _iter_plugins(project_type)]
url(
url_config.get(constants.PluginURLs.REGEX, r''),
include(
url_module_path,
app_name=url_config.get(constants.PluginURLs.APP_NAME),
namespace=url_config[constants.PluginURLs.NAMESPACE],
),
)
for url_module_path, url_config in _iter_plugins(project_type)
]
def _iter_plugins(project_type): def _iter_plugins(project_type):
@@ -37,7 +41,7 @@ def _iter_plugins(project_type):
urls_module_path = utils.get_module_path(app_config, url_config, constants.PluginURLs) urls_module_path = utils.get_module_path(app_config, url_config, constants.PluginURLs)
url_config[constants.PluginURLs.NAMESPACE] = url_config.get(constants.PluginURLs.NAMESPACE, app_config.name) url_config[constants.PluginURLs.NAMESPACE] = url_config.get(constants.PluginURLs.NAMESPACE, app_config.name)
url_config[constants.PluginURLs.APP_NAME] = app_config.name
log.debug( log.debug(
u'Plugin Apps [URLs]: Found %s with namespace %s for %s', u'Plugin Apps [URLs]: Found %s with namespace %s for %s',
app_config.name, app_config.name,

2
openedx/core/lib/api/tests/test_authentication.py
View File

@@ -55,7 +55,7 @@ class OAuth2AuthenticationDebug(authentication.OAuth2AuthenticationAllowInactive
urlpatterns = [ urlpatterns = [
url(r'^oauth2/', include('provider.oauth2.urls', namespace='oauth2')), url(r'^oauth2/', include(('provider.oauth2.urls', 'oauth2'), namespace='oauth2')),
url( url(
r'^oauth2-test/$', r'^oauth2-test/$',
MockView.as_view(authentication_classes=[authentication.OAuth2AuthenticationAllowInactiveUser]) MockView.as_view(authentication_classes=[authentication.OAuth2AuthenticationAllowInactiveUser])