summaryrefslogtreecommitdiff
path: root/yaksh
diff options
context:
space:
mode:
authorankitjavalkar2016-06-10 16:53:17 +0530
committerankitjavalkar2016-07-08 12:36:46 +0530
commit5e54ec5bbdcb79224d29226cfbbf852e3c3d7339 (patch)
tree2c231f165f184460d294acaf4eca3eda720d0ee8 /yaksh
parent4cd9882c2e0e294b86e447e769bea6f66f69ff28 (diff)
downloadonline_test-5e54ec5bbdcb79224d29226cfbbf852e3c3d7339.tar.gz
online_test-5e54ec5bbdcb79224d29226cfbbf852e3c3d7339.tar.bz2
online_test-5e54ec5bbdcb79224d29226cfbbf852e3c3d7339.zip
Fix Django versions in travis.yml and minor test errors
Diffstat (limited to 'yaksh')
-rw-r--r--yaksh/models.py2
-rw-r--r--yaksh/urls.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/yaksh/models.py b/yaksh/models.py
index ba092b8..c48eef1 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -42,7 +42,7 @@ test_case_types = (
attempts = [(i, i) for i in range(1, 6)]
attempts.append((-1, 'Infinite'))
-days_between_attempts = ((j, j) for j in range(401))
+days_between_attempts = [(j, j) for j in range(401)]
test_status = (
('inprogress', 'Inprogress'),
diff --git a/yaksh/urls.py b/yaksh/urls.py
index fa1713c..7a41f95 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -4,7 +4,7 @@ from django.contrib.auth.views import password_reset, password_reset_confirm,\
password_reset_done, password_reset_complete, password_change,\
password_change_done
-app_name = 'yaksh'
+# app_name = 'yaksh'
urlpatterns = [
url(r'^forgotpassword/$', password_reset, name="password_reset"),
url(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',