summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprathamesh2014-07-11 13:42:35 +0530
committerprathamesh2014-07-11 13:42:35 +0530
commite89f0b0e3a74195b3bce0f68c337ead9dc18a11e (patch)
treec01172875e05c2baf59223ac7c19d2cd4d51a5e6
parentd8a162ce5484dcdcb47ab0f01cc55ab4495bcc06 (diff)
downloadonline_test-e89f0b0e3a74195b3bce0f68c337ead9dc18a11e.tar.gz
online_test-e89f0b0e3a74195b3bce0f68c337ead9dc18a11e.tar.bz2
online_test-e89f0b0e3a74195b3bce0f68c337ead9dc18a11e.zip
Exam app using django 1.6.5
Removed version specification to install latest version of django. Added settings.py to the exam app. Removed default from import statement in urls.py since it is deprecated.
-rw-r--r--buildout.cfg6
-rw-r--r--production.cfg6
-rw-r--r--testapp/exam/settings.py20
-rw-r--r--testapp/exam/urls.py2
-rw-r--r--testapp/urls.py2
5 files changed, 22 insertions, 14 deletions
diff --git a/buildout.cfg b/buildout.cfg
index f0cb035..9ffc6d8 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -7,12 +7,6 @@ eggs =
django-taggit-autocomplete-modified
django-debug-toolbar
-versions = versions
-[versions]
-django = 1.3
-django-taggit = 0.10a1
-django-debug-toolbar = 0.8.4
-
[django]
recipe = djangorecipe
project = testapp
diff --git a/production.cfg b/production.cfg
index d623e80..c5ec49e 100644
--- a/production.cfg
+++ b/production.cfg
@@ -8,12 +8,6 @@ eggs =
django-taggit-autocomplete-modified
django-debug-toolbar
-versions = versions
-[versions]
-django = 1.3
-django-taggit = 0.10a1
-django-debug-toolbar = 0.8.4
-
[django]
recipe = djangorecipe
project = testapp
diff --git a/testapp/exam/settings.py b/testapp/exam/settings.py
new file mode 100644
index 0000000..682516f
--- /dev/null
+++ b/testapp/exam/settings.py
@@ -0,0 +1,20 @@
+"""
+settings for exam app.
+"""
+# The ports the code server should run on. This will run one separate
+# server for each port listed in the following list.
+SERVER_PORTS = [8001] # range(8001, 8026)
+
+# The server pool port. This is the server which returns available server
+# ports so as to minimize load. This is some random number where no other
+# service is running. It should be > 1024 and less < 65535 though.
+SERVER_POOL_PORT = 53579
+
+# Timeout for the code to run in seconds. This is an integer!
+SERVER_TIMEOUT = 2
+
+# The root of the URL, for example you might be in the situation where you
+# are not hosted as host.org/exam/ but as host.org/foo/exam/ for whatever
+# reason set this to the root you have to serve at. In the above example
+# host.org/foo/exam set URL_ROOT='/foo'
+URL_ROOT = ''
diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index b659cf6..37a031d 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
urlpatterns = patterns('exam.views',
url(r'^$', 'index'),
diff --git a/testapp/urls.py b/testapp/urls.py
index c82ecb6..0d126f4 100644
--- a/testapp/urls.py
+++ b/testapp/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
# Uncomment the next two lines to enable the admin:
from django.contrib import admin