Merge pull request #466 from ankitjavalkar/remove-ctx-instance

Remove the context instance argument in views.py

8 files changed, 102 insertions, 160 deletions

diff --git a/grades/urls.py b/grades/urls.py
index 49276ba9..32a7e4d 100644
--- a/grades/urls.py
+++ b/grades/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import url, patterns
+from django.conf.urls import url
 from grades import views
 
 urlpatterns = [
diff --git a/online_test/urls.py b/online_test/urls.py
index 3e62fd6..e55864a 100644
--- a/online_test/urls.py
+++ b/online_test/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index b170694..484111e 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -1,6 +1,6 @@
 -r requirements-codeserver.txt
 invoke==0.21.0
-django==1.9.5
+django==1.10
 django-taggit==0.18.1
 pytz==2016.4
 python-social-auth==0.2.19
diff --git a/setup.py b/setup.py
index 83a5e42..e8e1394 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ def get_version():
     return data.get('__version__')
 
 install_requires = [
-    'django==1.9.5',
+    'django==1.10',
     'django-taggit==0.18.1',
     'pytz==2016.4',
     'python-social-auth==0.2.19',
diff --git a/yaksh/decorators.py b/yaksh/decorators.py
index 9e9bc6d..4b886a3 100644
--- a/yaksh/decorators.py
+++ b/yaksh/decorators.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render_to_response, redirect
+from django.shortcuts import render, redirect
 from django.conf import settings
 from django.template import RequestContext
 
@@ -20,15 +20,13 @@ def has_profile(func):
     def _wrapped_view(request, *args, **kwargs):
         if user_has_profile(request.user):
             return func(request, *args, **kwargs)
-        ci = RequestContext(request)
         if request.user.groups.filter(name='moderator').exists():
             template = 'manage.html'
         else:
             template = 'user.html'
         form = ProfileForm(user=request.user, instance=None)
         context = {'template': template, 'form': form}
-        return render_to_response('yaksh/editprofile.html', context,
-                                    context_instance=ci)
+        return render(request, 'yaksh/editprofile.html', context)
     return _wrapped_view
 
 
@@ -40,7 +38,6 @@ def email_verified(func):
     """
 
     def is_email_verified(request, *args, **kwargs):
-        ci = RequestContext(request)
         user = request.user
         context = {}
         if not settings.IS_DEVELOPMENT:
@@ -49,7 +46,8 @@ def email_verified(func):
                     context['success'] = False
                     context['msg'] = "Your account is not verified. \
                                         Please verify your account"
-                    return render_to_response('yaksh/activation_status.html',
-                                                context, context_instance=ci)
+                    return render(
+                        request, 'yaksh/activation_status.html', context
+                    )
         return func(request, *args, **kwargs)
     return is_email_verified
\ No newline at end of file
diff --git a/yaksh/urls.py b/yaksh/urls.py
index dd450ba..3611573 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from yaksh import views
 
 urlpatterns = [
diff --git a/yaksh/urls_password_reset.py b/yaksh/urls_password_reset.py
index c1e36c6..4a7ddf3 100644
--- a/yaksh/urls_password_reset.py
+++ b/yaksh/urls_password_reset.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.contrib.auth.views import password_reset, password_reset_confirm,\
         password_reset_done, password_reset_complete, password_change,\
         password_change_done
diff --git a/yaksh/views.py b/yaksh/views.py
index 5ebe0b5..e1c1889 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -7,7 +7,7 @@ import csv
 from django.http import HttpResponse, JsonResponse
 from django.core.urlresolvers import reverse
 from django.contrib.auth import login, logout, authenticate
-from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.shortcuts import render, get_object_or_404, redirect
 from django.template import RequestContext, Context, Template
 from django.template.loader import get_template, render_to_string
 from django.http import Http404
@@ -65,14 +65,14 @@ def my_redirect(url):
     return redirect(URL_ROOT + url)
 
 
-def my_render_to_response(template, context=None, **kwargs):
+def my_render_to_response(request, template, context=None, **kwargs):
     """Overridden render_to_response.
     """
     if context is None:
         context = {'URL_ROOT': URL_ROOT}
     else:
         context['URL_ROOT'] = URL_ROOT
-    return render_to_response(template, context, **kwargs)
+    return render(request, template, context, **kwargs)
 
 
 def is_moderator(user):
@@ -115,7 +115,6 @@ def user_register(request):
     Create a user and corresponding profile and store roll_number also."""
 
     user = request.user
-    ci = RequestContext(request)
     if user.is_authenticated():
         return my_redirect("/exam/quizzes/")
     context = {}
@@ -130,16 +129,18 @@ def user_register(request):
                 success, msg = send_user_mail(user_email, key)
                 context = {'activation_msg': msg}
                 return my_render_to_response(
+                    request,
                     'yaksh/activation_status.html', context
                 )
             return index(request)
         else:
-            return my_render_to_response('yaksh/register.html', {'form': form},
-                                         context_instance=ci)
+            return my_render_to_response(
+                request, 'yaksh/register.html', {'form': form}
+            )
     else:
         form = UserRegisterForm()
         return my_render_to_response(
-            'yaksh/register.html', {'form': form}, context_instance=ci
+            request, 'yaksh/register.html', {'form': form}
         )
 
 
@@ -147,7 +148,7 @@ def user_logout(request):
     """Show a page to inform user that the quiz has been compeleted."""
     logout(request)
     context = {'message': "You have been logged out successfully"}
-    return my_render_to_response('yaksh/complete.html', context)
+    return my_render_to_response(request, 'yaksh/complete.html', context)
 
 
 @login_required
@@ -156,7 +157,6 @@ def user_logout(request):
 def quizlist_user(request, enrolled=None, msg=None):
     """Show All Quizzes that is available to logged-in user."""
     user = request.user
-    ci = RequestContext(request)
 
     if request.method == "POST":
         course_code = request.POST.get('course_code')
@@ -178,9 +178,7 @@ def quizlist_user(request, enrolled=None, msg=None):
     context = {'user': user, 'courses': courses, 'title': title,
                'msg': msg}
 
-    return my_render_to_response(
-        "yaksh/quizzes_user.html", context, context_instance=ci
-    )
+    return my_render_to_response(request, "yaksh/quizzes_user.html", context)
 
 
 @login_required
@@ -190,14 +188,13 @@ def results_user(request):
     user = request.user
     papers = AnswerPaper.objects.get_user_answerpapers(user)
     context = {'papers': papers}
-    return my_render_to_response("yaksh/results_user.html", context)
+    return my_render_to_response(request, "yaksh/results_user.html", context)
 
 
 @login_required
 @email_verified
 def add_question(request, question_id=None):
     user = request.user
-    ci = RequestContext(request)
     test_case_type = None
 
     if question_id is None:
@@ -259,7 +256,7 @@ def add_question(request, question_id=None):
                 'uploaded_files': uploaded_files
             }
             return my_render_to_response(
-                "yaksh/add_question.html", context, context_instance=ci
+                request, "yaksh/add_question.html", context
             )
 
     qform = QuestionForm(instance=question)
@@ -284,7 +281,7 @@ def add_question(request, question_id=None):
     context = {'qform': qform, 'fileform': fileform, 'question': question,
                'formsets': formsets, 'uploaded_files': uploaded_files}
     return my_render_to_response(
-        "yaksh/add_question.html", context, context_instance=ci
+        request, "yaksh/add_question.html", context
     )
 
 
@@ -294,7 +291,6 @@ def add_quiz(request, quiz_id=None, course_id=None):
     """To add a new quiz in the database.
     Create a new quiz and store it."""
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this course !')
     if quiz_id:
@@ -325,16 +321,13 @@ def add_quiz(request, quiz_id=None, course_id=None):
         context["course_id"] = course_id
         context["quiz"] = quiz
     context["form"] = form
-    return my_render_to_response(
-        'yaksh/add_quiz.html', context, context_instance=ci
-    )
+    return my_render_to_response(request, 'yaksh/add_quiz.html', context)
 
 
 @login_required
 @email_verified
 def add_exercise(request, quiz_id=None, course_id=None):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this course !')
     if quiz_id:
@@ -374,9 +367,7 @@ def add_exercise(request, quiz_id=None, course_id=None):
         context["exercise"] = quiz
         context["course_id"] = course_id
     context["form"] = form
-    return my_render_to_response(
-        'yaksh/add_exercise.html', context, context_instance=ci
-    )
+    return my_render_to_response(request, 'yaksh/add_exercise.html', context)
 
 
 @login_required
@@ -386,7 +377,6 @@ def prof_manage(request, msg=None):
     """Take credentials of the user with professor/moderator
     rights/permissions and log in."""
     user = request.user
-    ci = RequestContext(request)
     if not user.is_authenticated():
         return my_redirect('/exam/login')
     if not is_moderator(user):
@@ -416,7 +406,7 @@ def prof_manage(request, msg=None):
                'trial_paper': trial_paper, 'msg': msg
                }
     return my_render_to_response(
-        'yaksh/moderator_dashboard.html', context, context_instance=ci
+        request, 'yaksh/moderator_dashboard.html', context
     )
 
 
@@ -424,7 +414,6 @@ def user_login(request):
     """Take the credentials of the user and log the user in."""
 
     user = request.user
-    ci = RequestContext(request)
     context = {}
     if user.is_authenticated():
         return index(request)
@@ -444,8 +433,7 @@ def user_login(request):
         form = UserLoginForm()
         context = {"form": form}
 
-    return my_render_to_response('yaksh/login.html', context,
-                                 context_instance=ci)
+    return my_render_to_response(request, 'yaksh/login.html', context)
 
 
 @login_required
@@ -455,7 +443,6 @@ def start(request, questionpaper_id=None, attempt_num=None, course_id=None,
     """Check the user cedentials and if any quiz is available,
     start the exam."""
     user = request.user
-    ci = RequestContext(request)
     # check conditions
     try:
         quest_paper = QuestionPaper.objects.get(id=questionpaper_id)
@@ -554,8 +541,7 @@ def start(request, questionpaper_id=None, attempt_num=None, course_id=None,
         }
         if is_moderator(user):
             context["status"] = "moderator"
-        return my_render_to_response('yaksh/intro.html', context,
-                                     context_instance=ci)
+        return my_render_to_response(request, 'yaksh/intro.html', context)
     else:
         ip = request.META['REMOTE_ADDR']
         if not hasattr(user, 'profile'):
@@ -564,10 +550,11 @@ def start(request, questionpaper_id=None, attempt_num=None, course_id=None,
         new_paper = quest_paper.make_answerpaper(user, ip, attempt_number,
                                                  course_id)
         if new_paper.status ==  'inprogress':
-            return show_question(request, new_paper.current_question(),
-                                 new_paper, course_id=course_id,
-                                 module_id=module_id, previous_question=None
-                                 )
+            return show_question(
+                request, new_paper.current_question(),
+                new_paper, course_id=course_id,
+                module_id=module_id, previous_question=None
+            )
         else:
             msg = 'You have already finished the quiz!'
             raise Http404(msg)
@@ -646,9 +633,7 @@ def show_question(request, question, paper, error_message=None, notification=Non
         last_attempt = answers[0].answer
         if last_attempt:
             context['last_attempt'] = last_attempt.encode('unicode-escape')
-    ci = RequestContext(request)
-    return my_render_to_response('yaksh/question.html', context,
-                                 context_instance=ci)
+    return my_render_to_response(request, 'yaksh/question.html', context)
 
 
 @login_required
@@ -902,8 +887,7 @@ def quit(request, reason=None, attempt_num=None, questionpaper_id=None,
                                     course_id=course_id)
     context = {'paper': paper, 'message': reason, 'course_id': course_id,
                'module_id': module_id}
-    return my_render_to_response('yaksh/quit.html', context,
-                                 context_instance=RequestContext(request))
+    return my_render_to_response(request, 'yaksh/quit.html', context)
 
 
 @login_required
@@ -916,7 +900,7 @@ def complete(request, reason=None, attempt_num=None, questionpaper_id=None,
         message = reason or "An Unexpected Error occurred. Please contact your '\
             'instructor/administrator.'"
         context = {'message': message}
-        return my_render_to_response('yaksh/complete.html', context)
+        return my_render_to_response(request, 'yaksh/complete.html', context)
     else:
         q_paper = QuestionPaper.objects.get(id=questionpaper_id)
         paper = AnswerPaper.objects.get(
@@ -936,14 +920,13 @@ def complete(request, reason=None, attempt_num=None, questionpaper_id=None,
                    'course_id': course_id, 'learning_unit': learning_unit}
         if is_moderator(user):
             context['user'] = "moderator"
-        return my_render_to_response('yaksh/complete.html', context)
+        return my_render_to_response(request, 'yaksh/complete.html', context)
 
 
 @login_required
 @email_verified
 def add_course(request, course_id=None):
     user = request.user
-    ci = RequestContext(request)
     if course_id:
         course = Course.objects.get(id=course_id)
         if not course.is_creator(user) and not course.is_teacher(user):
@@ -962,12 +945,12 @@ def add_course(request, course_id=None):
             return my_redirect('/exam/manage/courses')
         else:
             return my_render_to_response(
-                'yaksh/add_course.html', {'form': form}, context_instance=ci
+                request, 'yaksh/add_course.html', {'form': form}
             )
     else:
         form = CourseForm(instance=course)
         return my_render_to_response(
-            'yaksh/add_course.html', {'form': form}, context_instance=ci
+            request, 'yaksh/add_course.html', {'form': form}
         )
 
 
@@ -975,7 +958,6 @@ def add_course(request, course_id=None):
 @email_verified
 def enroll_request(request, course_id):
     user = request.user
-    ci = RequestContext(request)
     course = get_object_or_404(Course, pk=course_id)
     if not course.is_active_enrollment() and course.hidden:
         msg = (
@@ -995,7 +977,6 @@ def enroll_request(request, course_id):
 @email_verified
 def self_enroll(request, course_id):
     user = request.user
-    ci = RequestContext(request)
     course = get_object_or_404(Course, pk=course_id)
     if course.is_self_enroll():
         was_rejected = False
@@ -1010,7 +991,6 @@ def self_enroll(request, course_id):
 @email_verified
 def courses(request):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
     courses = Course.objects.filter(
@@ -1019,15 +999,13 @@ def courses(request):
         teachers=user, is_trial=False).order_by('-active', '-id')
     context = {'courses': courses, "allotted_courses": allotted_courses,
                "type": "courses"}
-    return my_render_to_response('yaksh/courses.html', context,
-                                 context_instance=ci)
+    return my_render_to_response(request, 'yaksh/courses.html', context)
 
 
 @login_required
 @email_verified
 def course_detail(request, course_id):
     user = request.user
-    ci = RequestContext(request)
 
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
@@ -1037,7 +1015,7 @@ def course_detail(request, course_id):
         raise Http404('This course does not belong to you')
 
     return my_render_to_response(
-        'yaksh/course_detail.html', {'course': course}, context_instance=ci
+        request, 'yaksh/course_detail.html', {'course': course}
     )
 
 
@@ -1045,7 +1023,6 @@ def course_detail(request, course_id):
 @email_verified
 def enroll(request, course_id, user_id=None, was_rejected=False):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
 
@@ -1067,7 +1044,7 @@ def enroll(request, course_id, user_id=None, was_rejected=False):
         enroll_ids = [user_id]
     if not enroll_ids:
         return my_render_to_response(
-            'yaksh/course_detail.html', {'course': course}, context_instance=ci
+            request, 'yaksh/course_detail.html', {'course': course}
         )
     users = User.objects.filter(id__in=enroll_ids)
     course.enroll(was_rejected, *users)
@@ -1078,7 +1055,6 @@ def enroll(request, course_id, user_id=None, was_rejected=False):
 @email_verified
 def send_mail(request, course_id, user_id=None):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
 
@@ -1102,16 +1078,13 @@ def send_mail(request, course_id, user_id=None):
         'course': course, 'message': message,
         'state': 'mail'
     }
-    return my_render_to_response(
-        'yaksh/course_detail.html', context, context_instance=ci
-    )
+    return my_render_to_response(request, 'yaksh/course_detail.html', context)
 
 
 @login_required
 @email_verified
 def reject(request, course_id, user_id=None, was_enrolled=False):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
 
@@ -1126,8 +1099,8 @@ def reject(request, course_id, user_id=None, was_enrolled=False):
     if not reject_ids:
         message = "Please select atleast one User"
         return my_render_to_response(
-            'yaksh/course_detail.html', {'course': course, 'message': message},
-            context_instance=ci
+            request, 'yaksh/course_detail.html',
+            {'course': course, 'message': message},
         )
     users = User.objects.filter(id__in=reject_ids)
     course.reject(was_enrolled, *users)
@@ -1167,8 +1140,9 @@ def show_statistics(request, questionpaper_id, attempt_number=None,
         context = {'quiz': quiz, 'attempts': attempt_numbers,
                    'questionpaper_id': questionpaper_id,
                    'course_id': course_id}
-        return my_render_to_response('yaksh/statistics_question.html', context,
-                                     context_instance=RequestContext(request))
+        return my_render_to_response(
+            request, 'yaksh/statistics_question.html', context
+        )
     total_attempt = AnswerPaper.objects.get_count(questionpaper_id,
                                                   attempt_number,
                                                   course_id)
@@ -1182,8 +1156,9 @@ def show_statistics(request, questionpaper_id, attempt_number=None,
                'questionpaper_id': questionpaper_id,
                'attempts': attempt_numbers, 'total': total_attempt,
                'course_id': course_id}
-    return my_render_to_response('yaksh/statistics_question.html', context,
-                                 context_instance=RequestContext(request))
+    return my_render_to_response(
+        request, 'yaksh/statistics_question.html', context
+    )
 
 
 @login_required
@@ -1192,7 +1167,6 @@ def monitor(request, quiz_id=None, course_id=None):
     """Monitor the progress of the papers taken so far."""
 
     user = request.user
-    ci = RequestContext(request)
     if not user.is_authenticated() or not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
 
@@ -1205,9 +1179,7 @@ def monitor(request, quiz_id=None, course_id=None):
             "papers": [], "course_details": course_details,
             "msg": "Monitor"
         }
-        return my_render_to_response(
-            'yaksh/monitor.html', context, context_instance=ci
-        )
+        return my_render_to_response(request, 'yaksh/monitor.html', context)
     # quiz_id is not None.
     try:
         quiz = get_object_or_404(Quiz, id=quiz_id)
@@ -1253,8 +1225,7 @@ def monitor(request, quiz_id=None, course_id=None):
         "attempt_numbers": attempt_numbers,
         "course": course
     }
-    return my_render_to_response('yaksh/monitor.html', context,
-                                 context_instance=ci)
+    return my_render_to_response(request, 'yaksh/monitor.html', context)
 
 
 @csrf_exempt
@@ -1278,7 +1249,7 @@ def ajax_questions_filter(request):
     questions = list(Question.objects.filter(**filter_dict))
 
     return my_render_to_response(
-        'yaksh/ajax_question_filter.html', {'questions': questions}
+        request, 'yaksh/ajax_question_filter.html', {'questions': questions}
     )
 
 
@@ -1407,9 +1378,7 @@ def design_questionpaper(request, quiz_id, questionpaper_id=None,
         'course_id': course_id
     }
     return my_render_to_response(
-        'yaksh/design_questionpaper.html',
-        context,
-        context_instance=RequestContext(request)
+        request, 'yaksh/design_questionpaper.html', context
     )
 
 
@@ -1419,7 +1388,6 @@ def show_all_questions(request):
     """Show a list of all the questions currently in the database."""
 
     user = request.user
-    ci = RequestContext(request)
     context = {}
     if not is_moderator(user):
         raise Http404("You are not allowed to view this page !")
@@ -1496,8 +1464,7 @@ def show_all_questions(request):
                                                     user=user).distinct()
             context['questions'] = search_result
 
-    return my_render_to_response('yaksh/showquestions.html', context,
-                                 context_instance=ci)
+    return my_render_to_response(request, 'yaksh/showquestions.html', context)
 
 
 @login_required
@@ -1511,8 +1478,7 @@ def user_data(request, user_id, questionpaper_id=None, course_id=None):
     data = AnswerPaper.objects.get_user_data(user, questionpaper_id, course_id)
 
     context = {'data': data, 'course_id': course_id}
-    return my_render_to_response('yaksh/user_data.html', context,
-                                 context_instance=RequestContext(request))
+    return my_render_to_response(request, 'yaksh/user_data.html', context)
 
 
 def _expand_questions(questions, field_list):
@@ -1601,7 +1567,6 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None,
     and update all their marks and also give comments for each paper.
     """
     current_user = request.user
-    ci = RequestContext(request)
     if not current_user.is_authenticated() or not is_moderator(current_user):
         raise Http404('You are not allowed to view this page!')
     course_details = Course.objects.filter(Q(creator=current_user) |
@@ -1675,9 +1640,7 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None,
         if course_status.exists():
             course_status.first().set_grade()
 
-    return my_render_to_response(
-        'yaksh/grade_user.html', context, context_instance=ci
-    )
+    return my_render_to_response(request, 'yaksh/grade_user.html', context)
 
 
 @login_required
@@ -1686,13 +1649,12 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None,
 def view_profile(request):
     """ view moderators and users profile """
     user = request.user
-    ci = RequestContext(request)
     if is_moderator(user):
         template = 'manage.html'
     else:
         template = 'user.html'
     context = {'template': template, 'user': user}
-    return my_render_to_response('yaksh/view_profile.html', context)
+    return my_render_to_response(request, 'yaksh/view_profile.html', context)
 
 
 @login_required
@@ -1701,7 +1663,6 @@ def edit_profile(request):
     """ edit profile details facility for moderator and students """
 
     user = request.user
-    ci = RequestContext(request)
     if is_moderator(user):
         template = 'manage.html'
     else:
@@ -1721,19 +1682,17 @@ def edit_profile(request):
             form_data.user.last_name = request.POST['last_name']
             form_data.user.save()
             form_data.save()
-            return my_render_to_response(
-                'yaksh/profile_updated.html', context_instance=ci
-            )
+            return my_render_to_response(request, 'yaksh/profile_updated.html')
         else:
             context['form'] = form
             return my_render_to_response(
-                'yaksh/editprofile.html', context, context_instance=ci
+                request, 'yaksh/editprofile.html', context
             )
     else:
         form = ProfileForm(user=user, instance=profile)
         context['form'] = form
         return my_render_to_response(
-            'yaksh/editprofile.html', context, context_instance=ci
+            request, 'yaksh/editprofile.html', context
         )
 
 
@@ -1742,7 +1701,6 @@ def edit_profile(request):
 def search_teacher(request, course_id):
     """ search teachers for the course """
     user = request.user
-    ci = RequestContext(request)
 
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
@@ -1769,9 +1727,7 @@ def search_teacher(request, course_id):
             )
             context['success'] = True
             context['teachers'] = teachers
-    return my_render_to_response(
-        'yaksh/addteacher.html', context, context_instance=ci
-    )
+    return my_render_to_response(request, 'yaksh/addteacher.html', context)
 
 
 @login_required
@@ -1780,7 +1736,6 @@ def add_teacher(request, course_id):
     """ add teachers to the course """
 
     user = request.user
-    ci = RequestContext(request)
 
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
@@ -1799,9 +1754,7 @@ def add_teacher(request, course_id):
         course.add_teachers(*teachers)
         context['status'] = True
         context['teachers_added'] = teachers
-    return my_render_to_response(
-        'yaksh/addteacher.html', context, context_instance=ci
-    )
+    return my_render_to_response(request, 'yaksh/addteacher.html', context)
 
 
 @login_required
@@ -1881,7 +1834,9 @@ def view_answerpaper(request, questionpaper_id, course_id):
         ).exists()
         context = {'data': data, 'quiz': quiz,
                    "has_user_assignment": has_user_assignment}
-        return my_render_to_response('yaksh/view_answerpaper.html', context)
+        return my_render_to_response(
+            request, 'yaksh/view_answerpaper.html', context
+        )
     else:
         return my_redirect('/exam/quizzes/')
 
@@ -1891,7 +1846,6 @@ def view_answerpaper(request, questionpaper_id, course_id):
 def create_demo_course(request):
     """ creates a demo course for user """
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404("You are not allowed to view this page")
     demo_course = Course()
@@ -1914,7 +1868,7 @@ def grader(request, extra_context=None):
     context = {'courses': user_courses}
     if extra_context:
         context.update(extra_context)
-    return my_render_to_response('yaksh/regrade.html', context)
+    return my_render_to_response(request, 'yaksh/regrade.html', context)
 
 
 @login_required
@@ -1998,14 +1952,13 @@ def download_course_csv(request, course_id):
 
 
 def activate_user(request, key):
-    ci = RequestContext(request)
     profile = get_object_or_404(Profile, activation_key=key)
     context = {}
     context['success'] = False
     if profile.is_email_verified:
         context['activation_msg'] = "Your account is already verified"
         return my_render_to_response(
-            'yaksh/activation_status.html', context, context_instance=ci
+            request, 'yaksh/activation_status.html', context
         )
 
     if timezone.now() > profile.key_expiry_time:
@@ -2019,12 +1972,11 @@ def activate_user(request, key):
         profile.save()
         context['msg'] = "Your account is activated"
     return my_render_to_response(
-        'yaksh/activation_status.html', context, context_instance=ci
+        request, 'yaksh/activation_status.html', context
     )
 
 
 def new_activation(request, email=None):
-    ci = RequestContext(request)
     context = {}
     if request.method == "POST":
         email = request.POST.get('email')
@@ -2035,15 +1987,13 @@ def new_activation(request, email=None):
         context['email_err_msg'] = "Multiple entries found for this email"\
                                     "Please change your email"
         return my_render_to_response(
-            'yaksh/activation_status.html', context, context_instance=ci
+            request, 'yaksh/activation_status.html', context
         )
     except ObjectDoesNotExist:
         context['success'] = False
         context['msg'] = "Your account is not verified. \
                             Please verify your account"
-        return render_to_response(
-            'yaksh/activation_status.html', context, context_instance=ci
-        )
+        return render_to_response('yaksh/activation_status.html', context)
 
     if not user.profile.is_email_verified:
         user.profile.activation_key = generate_activation_key(user.username)
@@ -2062,13 +2012,12 @@ def new_activation(request, email=None):
         context['activation_msg'] = "Your account is already verified"
 
     return my_render_to_response(
-        'yaksh/activation_status.html', context, context_instance=ci
+        request, 'yaksh/activation_status.html', context
     )
 
 
 def update_email(request):
     context = {}
-    ci = RequestContext(request)
     if request.method == "POST":
         email = request.POST.get('email')
         username = request.POST.get('username')
@@ -2079,7 +2028,7 @@ def update_email(request):
     else:
         context['email_err_msg'] = "Please Update your email"
         return my_render_to_response(
-            'yaksh/activation_status.html', context, context_instance=ci
+            request, 'yaksh/activation_status.html', context
         )
 
 
@@ -2118,7 +2067,6 @@ def download_assignment_file(request, quiz_id, question_id=None, user_id=None):
 @email_verified
 def upload_users(request, course_id):
     user = request.user
-    ci = RequestContext(request)
     course = get_object_or_404(Course, pk=course_id)
     context = {'course': course}
 
@@ -2128,32 +2076,35 @@ def upload_users(request, course_id):
     if request.method == 'POST':
         if 'csv_file' not in request.FILES:
             context['message'] = "Please upload a CSV file."
-            return my_render_to_response('yaksh/course_detail.html', context,
-                                         context_instance=ci)
+            return my_render_to_response(
+                request, 'yaksh/course_detail.html', context
+            )
         csv_file = request.FILES['csv_file']
         is_csv_file, dialect = is_csv(csv_file)
         if not is_csv_file:
             context['message'] = "The file uploaded is not a CSV file."
-            return my_render_to_response('yaksh/course_detail.html', context,
-                                         context_instance=ci)
+            return my_render_to_response(
+                request, 'yaksh/course_detail.html', context
+            )
         required_fields = ['firstname', 'lastname', 'email']
         try:
             reader = csv.DictReader(csv_file.read().decode('utf-8').splitlines(),
                                     dialect=dialect)
         except TypeError:
             context['message'] = "Bad CSV file"
-            return my_render_to_response('yaksh/course_detail.html', context,
-                                         context_instance=ci)
+            return my_render_to_response(
+                request, 'yaksh/course_detail.html', context
+            )
         stripped_fieldnames = [field.strip().lower() for field in reader.fieldnames]
         for field in required_fields:
             if field not in stripped_fieldnames:
                 context['message'] = "The CSV file does not contain the required headers"
-                return my_render_to_response('yaksh/course_detail.html', context,
-                                             context_instance=ci)
+                return my_render_to_response(
+                    request, 'yaksh/course_detail.html', context
+                )
         reader.fieldnames = stripped_fieldnames
         context['upload_details'] = _read_user_csv(reader, course)
-    return my_render_to_response('yaksh/course_detail.html', context,
-                                 context_instance=ci)
+    return my_render_to_response(request, 'yaksh/course_detail.html', context)
 
 
 def _read_user_csv(reader, course):
@@ -2311,7 +2262,6 @@ def download_yaml_template(request):
 @email_verified
 def edit_lesson(request, lesson_id=None, course_id=None):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
     if lesson_id:
@@ -2364,9 +2314,7 @@ def edit_lesson(request, lesson_id=None, course_id=None):
     context['lesson_file_form'] = lesson_files_form
     context['lesson_files'] = lesson_files
     context['course_id'] = course_id
-    return my_render_to_response(
-        'yaksh/add_lesson.html', context, context_instance=ci
-    )
+    return my_render_to_response(request, 'yaksh/add_lesson.html', context)
 
 
 @login_required
@@ -2407,14 +2355,13 @@ def show_lesson(request, lesson_id, module_id, course_id):
                'course': course, 'state': "lesson", "all_modules": all_modules,
                'learning_units': learning_units, "current_unit": learn_unit,
                'learning_module': learn_module}
-    return my_render_to_response('yaksh/show_video.html', context)
+    return my_render_to_response(request, 'yaksh/show_video.html', context)
 
 
 @login_required
 @email_verified
 def design_module(request, module_id, course_id=None):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
     context = {}
@@ -2480,15 +2427,13 @@ def design_module(request, module_id, course_id=None):
     context['status'] = 'design'
     context['module_id'] = module_id
     context['course_id'] = course_id
-    return my_render_to_response('yaksh/add_module.html', context,
-                                 context_instance=ci)
+    return my_render_to_response(request, 'yaksh/add_module.html', context)
 
 
 @login_required
 @email_verified
 def add_module(request, module_id=None, course_id=None):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
     redirect_url = "/exam/manage/courses/all_learning_module/"
@@ -2521,8 +2466,7 @@ def add_module(request, module_id=None, course_id=None):
     context['module_form'] = module_form
     context['course_id'] = course_id
     context['status'] = "add"
-    return my_render_to_response("yaksh/add_module.html",
-                                 context, context_instance=ci)
+    return my_render_to_response(request, "yaksh/add_module.html", context)
 
 
 @login_required
@@ -2533,7 +2477,7 @@ def show_all_quizzes(request):
         raise Http404('You are not allowed to view this page!')
     quizzes = Quiz.objects.filter(creator=user, is_trial=False)
     context = {"quizzes": quizzes, "type": "quiz"}
-    return my_render_to_response('yaksh/courses.html', context)
+    return my_render_to_response(request, 'yaksh/courses.html', context)
 
 
 @login_required
@@ -2544,7 +2488,7 @@ def show_all_lessons(request):
         raise Http404('You are not allowed to view this page!')
     lessons = Lesson.objects.filter(creator=user)
     context = {"lessons": lessons, "type": "lesson"}
-    return my_render_to_response('yaksh/courses.html', context)
+    return my_render_to_response(request, 'yaksh/courses.html', context)
 
 
 @login_required
@@ -2556,7 +2500,7 @@ def show_all_modules(request):
     learning_modules = LearningModule.objects.filter(
         creator=user, is_trial=False)
     context = {"learning_modules": learning_modules, "type": "learning_module"}
-    return my_render_to_response('yaksh/courses.html', context)
+    return my_render_to_response(request, 'yaksh/courses.html', context)
 
 
 @login_required
@@ -2631,7 +2575,6 @@ def get_next_unit(request, course_id, module_id, current_unit_id=None,
 @email_verified
 def design_course(request, course_id):
     user = request.user
-    ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
     course = Course.objects.get(id=course_id)
@@ -2685,8 +2628,9 @@ def design_course(request, course_id):
     context['added_learning_modules'] = added_learning_modules
     context['learning_modules'] = learning_modules
     context['course_id'] = course_id
-    return my_render_to_response('yaksh/design_course_session.html', context,
-                                 context_instance=ci)
+    return my_render_to_response(
+        request, 'yaksh/design_course_session.html', context
+    )
 
 
 @login_required
@@ -2721,7 +2665,7 @@ def view_module(request, module_id, course_id, msg=None):
     context['course'] = course
     context['state'] = "module"
     context['msg'] = msg
-    return my_render_to_response('yaksh/show_video.html', context)
+    return my_render_to_response(request, 'yaksh/show_video.html', context)
 
 
 @login_required
@@ -2745,7 +2689,7 @@ def course_modules(request, course_id, msg=None):
         if not course_status.grade:
             course_status.set_grade()
         context['grade'] = course_status.get_grade()
-    return my_render_to_response('yaksh/course_modules.html', context)
+    return my_render_to_response(request, 'yaksh/course_modules.html', context)
 
 
 @login_required
@@ -2762,7 +2706,7 @@ def course_status(request, course_id):
         'course': course, 'students': students,
         'state': 'course_status', 'modules': course.get_learning_modules()
     }
-    return my_render_to_response('yaksh/course_detail.html', context)
+    return my_render_to_response(request, 'yaksh/course_detail.html', context)
 
 
 def _update_unit_status(course_id, user, unit):
@@ -2796,5 +2740,5 @@ def preview_questionpaper(request, questionpaper_id):
     }
 
     return my_render_to_response(
-        'yaksh/preview_questionpaper.html', context
+        request, 'yaksh/preview_questionpaper.html', context
     )