From 41318981800789d374112a390cab185a24fbf6d0 Mon Sep 17 00:00:00 2001 From: stv Date: Thu, 26 Feb 2015 21:08:06 -0800 Subject: [PATCH] Remove "nopep" pragma --- cms/urls.py | 3 ++- common/djangoapps/heartbeat/urls.py | 4 +++- common/djangoapps/pipeline_js/urls.py | 4 +++- lms/djangoapps/class_dashboard/urls.py | 4 +++- lms/djangoapps/django_comment_client/base/urls.py | 4 +++- lms/djangoapps/django_comment_client/forum/urls.py | 4 +++- lms/djangoapps/django_comment_client/urls.py | 4 +++- lms/djangoapps/instructor/views/api_urls.py | 4 +++- lms/djangoapps/shoppingcart/urls.py | 4 +++- lms/djangoapps/survey/urls.py | 4 +++- lms/urls.py | 4 +++- 11 files changed, 32 insertions(+), 11 deletions(-) diff --git a/cms/urls.py b/cms/urls.py index 38cfef37d7..a505636afb 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -12,7 +12,8 @@ COURSELIKE_KEY_PATTERN = r'(?P({}|{}))'.format( # Pattern to match a library key only LIBRARY_KEY_PATTERN = r'(?Plibrary-v1:[^/+]+\+[^/+]+)' -urlpatterns = patterns('', # nopep8 +urlpatterns = patterns( + '', url(r'^transcripts/upload$', 'contentstore.views.upload_transcripts', name='upload_transcripts'), url(r'^transcripts/download$', 'contentstore.views.download_transcripts', name='download_transcripts'), diff --git a/common/djangoapps/heartbeat/urls.py b/common/djangoapps/heartbeat/urls.py index 6a0be757c9..c2fbdaa73e 100644 --- a/common/djangoapps/heartbeat/urls.py +++ b/common/djangoapps/heartbeat/urls.py @@ -1,5 +1,7 @@ from django.conf.urls import url, patterns -urlpatterns = patterns('', # nopep8 +urlpatterns = patterns( + '', + url(r'^$', 'heartbeat.views.heartbeat', name='heartbeat'), ) diff --git a/common/djangoapps/pipeline_js/urls.py b/common/djangoapps/pipeline_js/urls.py index 1806680b56..1fc732bcec 100644 --- a/common/djangoapps/pipeline_js/urls.py +++ b/common/djangoapps/pipeline_js/urls.py @@ -3,7 +3,9 @@ URL patterns for Javascript files used to load all of the XModule JS in one wad. """ from django.conf.urls import url, patterns -urlpatterns = patterns('pipeline_js.views', # nopep8 +urlpatterns = patterns( + 'pipeline_js.views', + url(r'^files\.json$', 'xmodule_js_files', name='xmodule_js_files'), url(r'^xmodule\.js$', 'requirejs_xmodule', name='requirejs_xmodule'), ) diff --git a/lms/djangoapps/class_dashboard/urls.py b/lms/djangoapps/class_dashboard/urls.py index fbb3eaf207..ca78be6a30 100644 --- a/lms/djangoapps/class_dashboard/urls.py +++ b/lms/djangoapps/class_dashboard/urls.py @@ -6,7 +6,9 @@ from django.conf.urls import patterns, url from django.conf import settings COURSE_ID_PATTERN = settings.COURSE_ID_PATTERN -urlpatterns = patterns('', # nopep8 +urlpatterns = patterns( + '', + # Json request data for metrics for entire course url(r'^{}/all_sequential_open_distrib$'.format(settings.COURSE_ID_PATTERN), 'class_dashboard.views.all_sequential_open_distrib', name="all_sequential_open_distrib"), diff --git a/lms/djangoapps/django_comment_client/base/urls.py b/lms/djangoapps/django_comment_client/base/urls.py index bb850e420b..e49278ad7c 100644 --- a/lms/djangoapps/django_comment_client/base/urls.py +++ b/lms/djangoapps/django_comment_client/base/urls.py @@ -1,6 +1,8 @@ from django.conf.urls.defaults import url, patterns -urlpatterns = patterns('django_comment_client.base.views', # nopep8 +urlpatterns = patterns( + 'django_comment_client.base.views', + url(r'upload$', 'upload', name='upload'), url(r'threads/(?P[\w\-]+)/update$', 'update_thread', name='update_thread'), url(r'threads/(?P[\w\-]+)/reply$', 'create_comment', name='create_comment'), diff --git a/lms/djangoapps/django_comment_client/forum/urls.py b/lms/djangoapps/django_comment_client/forum/urls.py index 863267fde9..cb11d99571 100644 --- a/lms/djangoapps/django_comment_client/forum/urls.py +++ b/lms/djangoapps/django_comment_client/forum/urls.py @@ -1,6 +1,8 @@ from django.conf.urls.defaults import url, patterns -urlpatterns = patterns('django_comment_client.forum.views', # nopep8 +urlpatterns = patterns( + 'django_comment_client.forum.views', + url(r'users/(?P\w+)/followed$', 'followed_threads', name='followed_threads'), url(r'users/(?P\w+)$', 'user_profile', name='user_profile'), url(r'^(?P[\w\-.]+)/threads/(?P\w+)$', 'single_thread', name='single_thread'), diff --git a/lms/djangoapps/django_comment_client/urls.py b/lms/djangoapps/django_comment_client/urls.py index 98700da4ab..eee27ada4b 100644 --- a/lms/djangoapps/django_comment_client/urls.py +++ b/lms/djangoapps/django_comment_client/urls.py @@ -1,6 +1,8 @@ from django.conf.urls.defaults import url, patterns, include -urlpatterns = patterns('', # nopep8 +urlpatterns = patterns( + '', + url(r'forum/?', include('django_comment_client.forum.urls')), url(r'', include('django_comment_client.base.urls')), ) diff --git a/lms/djangoapps/instructor/views/api_urls.py b/lms/djangoapps/instructor/views/api_urls.py index 7fcc76923d..24c0df81a9 100644 --- a/lms/djangoapps/instructor/views/api_urls.py +++ b/lms/djangoapps/instructor/views/api_urls.py @@ -5,7 +5,9 @@ Instructor API endpoint urls. from django.conf.urls import patterns, url -urlpatterns = patterns('', # nopep8 +urlpatterns = patterns( + '', + url(r'^students_update_enrollment$', 'instructor.views.api.students_update_enrollment', name="students_update_enrollment"), url(r'^register_and_enroll_students$', diff --git a/lms/djangoapps/shoppingcart/urls.py b/lms/djangoapps/shoppingcart/urls.py index 79e83bc7e5..9363521ddc 100644 --- a/lms/djangoapps/shoppingcart/urls.py +++ b/lms/djangoapps/shoppingcart/urls.py @@ -1,7 +1,9 @@ from django.conf.urls import patterns, url from django.conf import settings -urlpatterns = patterns('shoppingcart.views', # nopep8 +urlpatterns = patterns( + 'shoppingcart.views', + url(r'^postpay_callback/$', 'postpay_callback'), # Both the ~accept and ~reject callback pages are handled here url(r'^receipt/(?P[0-9]*)/$', 'show_receipt'), url(r'^donation/$', 'donate', name='donation'), diff --git a/lms/djangoapps/survey/urls.py b/lms/djangoapps/survey/urls.py index 727602e9d4..ad986159e4 100644 --- a/lms/djangoapps/survey/urls.py +++ b/lms/djangoapps/survey/urls.py @@ -5,7 +5,9 @@ URL mappings for the Survey feature from django.conf.urls import patterns, url -urlpatterns = patterns('survey.views', # nopep8 +urlpatterns = patterns( + 'survey.views', + url(r'^(?P[0-9A-Za-z]+)/$', 'view_survey', name='view_survey'), url(r'^(?P[0-9A-Za-z]+)/answers/$', 'submit_answers', name='submit_answers'), ) diff --git a/lms/urls.py b/lms/urls.py index dbe41e1f3e..0b324ca9aa 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -12,7 +12,9 @@ if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'): # Use urlpatterns formatted as within the Django docs with first parameter "stuck" to the open parenthesis # pylint: disable=bad-continuation -urlpatterns = ('', # nopep8 +urlpatterns = ( + '', + # certificate view url(r'^update_certificate$', 'certificates.views.update_certificate'), url(r'^request_certificate$', 'certificates.views.request_certificate'),