Merge pull request #91 from prathamesh920/migration_to_django_1_9

Migration from django 1.6 to django 1.9

1 files changed, 58 insertions, 56 deletions

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 3a75947..b2f894f 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -1,75 +1,77 @@
 from django.conf.urls import patterns, url
+from yaksh import views
+from django.contrib.auth.views import password_reset, password_reset_confirm,\
+        password_reset_done, password_reset_complete
 
-urlpatterns = patterns('django.contrib.auth.views',
-    url(r'^forgotpassword/$', 'password_reset', name="password_reset"),
+urlpatterns = [
+    url(r'^forgotpassword/$', password_reset, name="password_reset"),
     url(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
-        'password_reset_confirm', name='password_reset_confirm'),
-    url(r'^password_reset/mail_sent/$', 'password_reset_done',
+        password_reset_confirm, name='password_reset_confirm'),
+    url(r'^password_reset/mail_sent/$', password_reset_done,
         name='password_reset_done'),
-    url(r'^password_reset/complete/$', 'password_reset_complete',
+    url(r'^password_reset/complete/$', password_reset_complete,
         name='password_reset_complete'),
-)
-urlpatterns += patterns('yaksh.views',
-    url(r'^$', 'index'),
-    url(r'^login/$', 'user_login'),
-    url(r'^quizzes/$', 'quizlist_user'),
-    url(r'^results/$', 'results_user'),
-    url(r'^start/$', 'start'),
-    url(r'^start/(?P<questionpaper_id>\d+)/$', 'start'),
-    url(r'^start/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$', 'start'),
-    url(r'^quit/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$', 'quit'),
-    url(r'^complete/$', 'complete'),
+]
+urlpatterns += [
+    url(r'^$', views.index),
+    url(r'^login/$', views.user_login),
+    url(r'^quizzes/$', views.quizlist_user),
+    url(r'^results/$', views.results_user),
+    url(r'^start/$', views.start),
+    url(r'^start/(?P<questionpaper_id>\d+)/$', views.start),
+    url(r'^start/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$', views.start),
+    url(r'^quit/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$', views.quit),
+    url(r'^complete/$', views.complete),
     url(r'^complete/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',\
-            'complete'),
-    url(r'^register/$', 'user_register'),
-    url(r'^(?P<q_id>\d+)/check/$', 'check'),
+            views.complete),
+    url(r'^register/$', views.user_register),
+    url(r'^(?P<q_id>\d+)/check/$', views.check),
     url(r'^(?P<q_id>\d+)/check/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',\
-            'check'),
+            views.check),
     url(r'^(?P<q_id>\d+)/skip/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',
-        'skip'),
+        views.skip),
     url(r'^(?P<q_id>\d+)/skip/(?P<next_q>\d+)/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',
-        'skip'),
-    url(r'^enroll_request/(?P<course_id>\d+)/$', 'enroll_request'),
-    url(r'^self_enroll/(?P<course_id>\d+)/$', 'self_enroll'),
+        views.skip),
+    url(r'^enroll_request/(?P<course_id>\d+)/$', views.enroll_request),
+    url(r'^self_enroll/(?P<course_id>\d+)/$', views.self_enroll),
 
-    url(r'^manage/$', 'prof_manage'),
-    url(r'^manage/addquestion/$', 'add_question'),
-    url(r'^manage/addquestion/(?P<question_id>\d+)/$', 'add_question'),
-    url(r'^manage/addquiz/$', 'add_quiz'),
-    url(r'^manage/addquiz/(?P<quiz_id>\d+)/$', 'add_quiz'),
-    url(r'^manage/gradeuser/$', 'show_all_users'),
+    url(r'^manage/$', views.prof_manage),
+    url(r'^manage/addquestion/$', views.add_question),
+    url(r'^manage/addquestion/(?P<question_id>\d+)/$', views.add_question),
+    url(r'^manage/addquiz/$', views.add_quiz),
+    url(r'^manage/addquiz/(?P<quiz_id>\d+)/$', views.add_quiz),
+    url(r'^manage/gradeuser/$', views.show_all_users),
     url(r'^manage/gradeuser/(?P<username>.*)/(?P<questionpaper_id>\d+)/$',
-        'grade_user'),
-    url(r'^manage/gradeuser/(?P<username>.*)/$', 'grade_user'),
-    url(r'^manage/questions/$', 'show_all_questions'),
-    url(r'^manage/monitor/$', 'monitor'),
-    url(r'^manage/showquestionpapers/$', 'show_all_questionpapers'),
+        views.grade_user),
+    url(r'^manage/gradeuser/(?P<username>.*)/$', views.grade_user),
+    url(r'^manage/questions/$', views.show_all_questions),
+    url(r'^manage/monitor/$', views.monitor),
+    url(r'^manage/showquestionpapers/$', views.show_all_questionpapers),
     url(r'^manage/showquestionpapers/(?P<questionpaper_id>\d+)/$',\
-                                                    'show_all_questionpapers'),
-    url(r'^manage/monitor/(?P<questionpaper_id>\d+)/$', 'monitor'),
+                                                    views.show_all_questionpapers),
+    url(r'^manage/monitor/(?P<questionpaper_id>\d+)/$', views.monitor),
     url(r'^manage/user_data/(?P<username>.*)/(?P<questionpaper_id>\d+)/$',
-        'user_data'),
-    url(r'^manage/user_data/(?P<username>.*)/$', 'user_data'),
-    url(r'^manage/designquestionpaper/$', 'design_questionpaper'),
+        views.user_data),
+    url(r'^manage/user_data/(?P<username>.*)/$', views.user_data),
+    url(r'^manage/designquestionpaper/$', views.design_questionpaper),
     url(r'^manage/designquestionpaper/(?P<questionpaper_id>\d+)/$',\
-                                                        'design_questionpaper'),
+                                                        views.design_questionpaper),
     url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/$',
-        'show_statistics'),
+        views.show_statistics),
     url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/(?P<attempt_number>\d+)/$',
-        'show_statistics'),
+        views.show_statistics),
     url(r'^manage/monitor/download_csv/(?P<questionpaper_id>\d+)/$',
-        'download_csv'),
-    url(r'manage/courses/$', 'courses'),
-    url(r'manage/add_course/$', 'add_course'),
-    url(r'manage/course_detail/(?P<course_id>\d+)/$', 'course_detail'),
-    url(r'manage/enroll/(?P<course_id>\d+)/(?P<user_id>\d+)/$', 'enroll'),
+        views.download_csv),
+    url(r'manage/courses/$', views.courses),
+    url(r'manage/add_course/$', views.add_course),
+    url(r'manage/course_detail/(?P<course_id>\d+)/$', views.course_detail),
+    url(r'manage/enroll/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.enroll),
     url(r'manage/enroll/rejected/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
-        'enroll', {'was_rejected': True}),
-    url(r'manage/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$', 'reject'),
+        views.enroll, {'was_rejected': True}),
+    url(r'manage/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.reject),
     url(r'manage/enrolled/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
-        'reject', {'was_enrolled': True}),
-    url(r'manage/toggle_status/(?P<course_id>\d+)/$', 'toggle_course_status'),
-    url(r'^ajax/questionpaper/(?P<query>.+)/$', 'ajax_questionpaper'),
-    url(r'^ajax/questions/filter/$', 'ajax_questions_filter'),
-
-)
+        views.reject, {'was_enrolled': True}),
+    url(r'manage/toggle_status/(?P<course_id>\d+)/$', views.toggle_course_status),
+    url(r'^ajax/questionpaper/(?P<query>.+)/$', views.ajax_questionpaper),
+    url(r'^ajax/questions/filter/$', views.ajax_questions_filter),
+]