Commit f5a83d5d by John Eskew

Fix URLs that generate warnings in Django 1.10.

parent 62f91dd7
...@@ -46,7 +46,7 @@ urlpatterns = [ ...@@ -46,7 +46,7 @@ urlpatterns = [
# noop to squelch ajax errors # noop to squelch ajax errors
url(r'^event$', contentstore.views.event, name='event'), url(r'^event$', contentstore.views.event, name='event'),
url(r'^xmodule/', include('pipeline_js.urls')), url(r'^xmodule/', include('pipeline_js.urls')),
url(r'^heartbeat$', include('openedx.core.djangoapps.heartbeat.urls')), url(r'^heartbeat', include('openedx.core.djangoapps.heartbeat.urls')),
url(r'^user_api/', include('openedx.core.djangoapps.user_api.legacy_urls')), url(r'^user_api/', include('openedx.core.djangoapps.user_api.legacy_urls')),
url(r'^i18n/', include('django.conf.urls.i18n')), url(r'^i18n/', include('django.conf.urls.i18n')),
......
...@@ -7,8 +7,8 @@ from edxnotes import views ...@@ -7,8 +7,8 @@ from edxnotes import views
# Additionally, we include login URLs for the browseable API. # Additionally, we include login URLs for the browseable API.
urlpatterns = [ urlpatterns = [
url(r"^/$", views.edxnotes, name="edxnotes"), url(r"^$", views.edxnotes, name="edxnotes"),
url(r"^/notes/$", views.notes, name="notes"), url(r"^notes/$", views.notes, name="notes"),
url(r"^/token/$", views.get_token, name="get_token"), url(r"^token/$", views.get_token, name="get_token"),
url(r"^/visibility/$", views.edxnotes_visibility, name="edxnotes_visibility"), url(r"^visibility/$", views.edxnotes_visibility, name="edxnotes_visibility"),
] ]
...@@ -8,5 +8,5 @@ from django.contrib.auth.decorators import login_required ...@@ -8,5 +8,5 @@ from django.contrib.auth.decorators import login_required
from .views import TeamsDashboardView from .views import TeamsDashboardView
urlpatterns = [ urlpatterns = [
url(r"^/$", login_required(TeamsDashboardView.as_view()), name="teams_dashboard") url(r"^$", login_required(TeamsDashboardView.as_view()), name="teams_dashboard")
] ]
...@@ -72,7 +72,7 @@ urlpatterns = [ ...@@ -72,7 +72,7 @@ urlpatterns = [
# Static template view endpoints like blog, faq, etc. # Static template view endpoints like blog, faq, etc.
url(r'', include('static_template_view.urls')), url(r'', include('static_template_view.urls')),
url(r'^heartbeat$', include('openedx.core.djangoapps.heartbeat.urls')), url(r'^heartbeat', include('openedx.core.djangoapps.heartbeat.urls')),
# Note: these are older versions of the User API that will eventually be # Note: these are older versions of the User API that will eventually be
# subsumed by api/user listed below. # subsumed by api/user listed below.
...@@ -634,7 +634,7 @@ urlpatterns += [ ...@@ -634,7 +634,7 @@ urlpatterns += [
# Student Notes # Student Notes
url( url(
r'^courses/{}/edxnotes'.format( r'^courses/{}/edxnotes/'.format(
settings.COURSE_ID_PATTERN, settings.COURSE_ID_PATTERN,
), ),
include('edxnotes.urls'), include('edxnotes.urls'),
...@@ -686,7 +686,7 @@ if settings.FEATURES['ENABLE_TEAMS']: ...@@ -686,7 +686,7 @@ if settings.FEATURES['ENABLE_TEAMS']:
include('lms.djangoapps.teams.api_urls') include('lms.djangoapps.teams.api_urls')
), ),
url( url(
r'^courses/{}/teams'.format( r'^courses/{}/teams/'.format(
settings.COURSE_ID_PATTERN, settings.COURSE_ID_PATTERN,
), ),
include('lms.djangoapps.teams.urls'), include('lms.djangoapps.teams.urls'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment