diff options
| author | prathamesh | 2014-09-25 16:31:44 +0530 |
|---|---|---|
| committer | prathamesh | 2014-09-25 16:31:44 +0530 |
| commit | 69bd6d797129a5292b2752d334b3d4fc39744157 (patch) | |
| tree | b428edecea2f30b1caa869d28c4ce01eaadebc4c | |
| parent | 0d36302753a5c9e74194c0d828182ca76a460a65 (diff) | |
| parent | a51ae0eddcbc689e01d5f7843b95916561830c55 (diff) | |
| download | online_test-69bd6d797129a5292b2752d334b3d4fc39744157.tar.gz online_test-69bd6d797129a5292b2752d334b3d4fc39744157.tar.bz2 online_test-69bd6d797129a5292b2752d334b3d4fc39744157.zip | |
Merge branch 'app_package'
4 files changed, 5 insertions, 5 deletions
diff --git a/testapp/exam/management/commands/dump_user_data.py b/testapp/exam/management/commands/dump_user_data.py index ec016bb..c5537e5 100644 --- a/testapp/exam/management/commands/dump_user_data.py +++ b/testapp/exam/management/commands/dump_user_data.py @@ -5,8 +5,8 @@ from django.core.management.base import BaseCommand from django.template import Template, Context # Local imports. -from exam.views import get_user_data -from exam.models import User +from testapp.exam.views import get_user_data +from testapp.exam.models import User data_template = Template('''\ =============================================================================== diff --git a/testapp/exam/management/commands/load_exam.py b/testapp/exam/management/commands/load_exam.py index e3f72da..c4a34a3 100644 --- a/testapp/exam/management/commands/load_exam.py +++ b/testapp/exam/management/commands/load_exam.py @@ -5,7 +5,7 @@ from os.path import basename from django.core.management.base import BaseCommand # Local imports. -from exam.models import Question, Quiz +from testapp.exam.models import Question, Quiz def clear_exam(): """Deactivate all questions from the database.""" diff --git a/testapp/exam/management/commands/load_questions_xml.py b/testapp/exam/management/commands/load_questions_xml.py index 8bc2701..3e13ae1 100644 --- a/testapp/exam/management/commands/load_questions_xml.py +++ b/testapp/exam/management/commands/load_questions_xml.py @@ -8,7 +8,7 @@ import re from django.core.management.base import BaseCommand # Local imports. -from exam.models import Question +from testapp.exam.models import Question def decode_html(html_str): """Un-escape or decode HTML strings to more usable Python strings. diff --git a/testapp/exam/management/commands/results2csv.py b/testapp/exam/management/commands/results2csv.py index 2993745..1cdf8e3 100644 --- a/testapp/exam/management/commands/results2csv.py +++ b/testapp/exam/management/commands/results2csv.py @@ -7,7 +7,7 @@ from django.core.management.base import BaseCommand from django.template import Template, Context # Local imports. -from exam.models import Quiz, QuestionPaper +from testapp.exam.models import Quiz, QuestionPaper result_template = Template('''\ "name","username","rollno","email","answered","total","attempts","position",\ |