From 523390f284b93e10af35058931b06eed1550700c Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Mon, 11 Apr 2016 18:20:29 +0530
Subject: Migration from django 1.6 to django 1.9

- upgraded django-taggit to 0.18 from 0.12.2
- added fields attribute in django forms, mandatory in django 1.9
- get_profile attribute of User object deprecated, used hasattr instead.
- Template settings changed in django 1.9, all template related settings
  at one place.
- Support for string view arguments to url() is deprecated, so passed
  callable views instead.
- django.conf.urls.patterns() is deprecated, updated urlpatterns to a list of
  django.conf.urls.url() instances instead.
- django.utils.unittest is deprecated, used unittest instead.
- made changes in requirements and setup files

other
- added quiz prerequisite required as false in forms, so that the quiz
  is added without any prerequisite.
- Time zone settings not implemented.
---
 yaksh/views.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'yaksh/views.py')

diff --git a/yaksh/views.py b/yaksh/views.py
index c65fb26..8b0a131 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -359,9 +359,7 @@ def start(request, questionpaper_id=None, attempt_num=None):
                                      context_instance=ci)
     else:
         ip = request.META['REMOTE_ADDR']
-        try:
-            profile = user.get_profile()
-        except Profile.DoesNotExist:
+        if not hasattr(user, 'profile'):
             msg = 'You do not have a profile and cannot take the quiz!'
             raise Http404(msg)
         new_paper = quest_paper.make_answerpaper(user, ip, attempt_num)
@@ -724,11 +722,7 @@ def get_user_data(username, questionpaper_id=None):
                 '-attempt_number')
 
     data = {}
-    try:
-        profile = user.get_profile()
-    except Profile.DoesNotExist:
-        # Admin user may have a paper by accident but no profile.
-        profile = None
+    profile = user.profile if hasattr(user, 'profile') else None
     data['user'] = user
     data['profile'] = profile
     data['papers'] = papers
-- 
cgit