From 5f0a5f7429ff74cccdc772fd45e0e5d3ee49891d Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 5 Mar 2020 10:46:31 +0530
Subject: Change in decorators, tests, travis

- Remove python 2.7 from travis
- Fix url reverse function import in views tests
- Fix error in is_email_verified decorator for user is_authenticated
---
 .travis.yml                | 3 +--
 grades/tests/test_views.py | 2 +-
 yaksh/decorators.py        | 2 +-
 yaksh/test_views.py        | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 59eaa66..8cdf21f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
 language: python
 
 python:
-  - "2.7"
-  - "3.5"
+  - "3.6"
 
 before_install:
   - sudo apt-get update -qq
diff --git a/grades/tests/test_views.py b/grades/tests/test_views.py
index 6b76565..6e066a4 100644
--- a/grades/tests/test_views.py
+++ b/grades/tests/test_views.py
@@ -1,6 +1,6 @@
 from django.test import TestCase, Client
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from grades.models import GradingSystem
 
 
diff --git a/yaksh/decorators.py b/yaksh/decorators.py
index 81912f0..d584868 100644
--- a/yaksh/decorators.py
+++ b/yaksh/decorators.py
@@ -40,7 +40,7 @@ def email_verified(func):
         user = request.user
         context = {}
         if not settings.IS_DEVELOPMENT:
-            if user.is_authenticated() and user_has_profile(user):
+            if user.is_authenticated and user_has_profile(user):
                 if not user.profile.is_email_verified:
                     context['success'] = False
                     context['msg'] = "Your account is not verified. \
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index 58c6633..7c932b5 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -11,7 +11,7 @@ import shutil
 from markdown import Markdown
 from django.contrib.auth.models import Group
 from django.contrib.auth import authenticate
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from django.test import Client
 from django.http import Http404
@@ -3740,7 +3740,7 @@ class TestPasswordReset(TestCase):
         # Then
         self.assertEqual(response.context['email'], self.user1.email)
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, '/exam/reset/password_reset/mail_sent/')
+        self.assertRedirects(response, '/exam/reset/password_reset/done/')
 
     def test_password_change_post(self):
         """
-- 
cgit