reading 2scoops of django, making changes! Relative explicit imports

diff --git a/multichoice/tests.py b/multichoice/tests.py
index 1dd8455d0bdd8f1dd89cffea8fde4f45ea6b5d72..b5ca1d20b41016638fa932223b784329e2913174 100644 (file)
--- a/multichoice/tests.py
+++ b/multichoice/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from multichoice.models import MCQuestion, Answer
+from .models import MCQuestion, Answer
 
 
 class TestMCQuestionModel(TestCase):

diff --git a/quiz/admin.py b/quiz/admin.py
index 914b77d4ae8f4854d8880441296c3a0cb9db44f6..be1a4f6927de2af00f0d02663fc299c20d684584 100644 (file)
--- a/quiz/admin.py
+++ b/quiz/admin.py
@@ -2,7 +2,7 @@ from django import forms
 from django.contrib import admin
 from django.contrib.admin.widgets import FilteredSelectMultiple
 
-from quiz.models import Quiz, Category, Progress, Question
+from .models import Quiz, Category, Progress, Question
 from multichoice.models import MCQuestion, Answer
 from true_false.models import TF_Question
 

diff --git a/quiz/tests.py b/quiz/tests.py
index 0803d115da02b6238500ed6f1d808c8edd24b71f..4b8561af8dce12022ad6eeae0dcf211cfa3f8a16 100644 (file)
--- a/quiz/tests.py
+++ b/quiz/tests.py
@@ -5,8 +5,8 @@ from django.core.urlresolvers import resolve
 from django.test import TestCase
 from django.template import Template, Context
 
-from quiz.models import Category, Quiz, Progress, Sitting
-from quiz.views import quiz_take
+from .models import Category, Quiz, Progress, Sitting
+from .views import quiz_take
 from multichoice.models import MCQuestion, Answer
 from true_false.models import TF_Question
 

diff --git a/quiz/urls.py b/quiz/urls.py
index 4ddf1835462d81094f8ffb76746541a54cc4b649..ba4d8b55fce130b286ce3718ce73cdf5fb933edf 100644 (file)
--- a/quiz/urls.py
+++ b/quiz/urls.py
@@ -1,31 +1,32 @@
 from django.conf.urls import patterns, url
 
-urlpatterns = patterns('',
+
+urlpatterns = patterns('quiz.views',
                        # quiz base url
-                       url(r'^$',
-                           'quiz.views.index',
+                       url(regex=r'^$',
+                           view='index',
                            name='quiz_index'),
 
-                       url(r'^category/$',
-                           'quiz.views.list_categories',
+                       url(regex=r'^category/$',
+                           view='list_categories',
                            name='quiz_category_list_all'),
 
                        # quiz category: list quizzes
-                       url(r'^category/(?P<slug>[\w.-]+)/$',
-                           'quiz.views.view_category',
+                       url(regex=r'^category/(?P<slug>[\w.-]+)/$',
+                           view='view_category',
                            name='quiz_category_list_matching'),
 
                        #  progress
-                       url(r'^progress/$',
-                           'quiz.views.progress',
+                       url(regex=r'^progress/$',
+                           view='progress',
                            name='quiz_progress'),
 
                        #  passes variable 'quiz_name' to quiz_take view
-                       url(r'^(?P<quiz_name>[\w-]+)/$',
-                           'quiz.views.quiz_take',
+                       url(regex=r'^(?P<quiz_name>[\w-]+)/$',
+                           view='quiz_take',
                            name='quiz_start_page'),
 
-                       url(r'^(?P<quiz_name>[\w-]+)/take/$',
-                           'quiz.views.quiz_take',
+                       url(regex=r'^(?P<quiz_name>[\w-]+)/take/$',
+                           view='quiz_take',
                            name='quiz_question'),
                        )

diff --git a/quiz/views.py b/quiz/views.py
index d1e9caba3419c7680cf06bdb35b9079f6cdf1dee..a455e3117df29d527db34430327c5bda77fc05a4 100644 (file)
--- a/quiz/views.py
+++ b/quiz/views.py
@@ -3,7 +3,7 @@ import random
 from django.template import RequestContext
 from django.shortcuts import get_object_or_404, render, render_to_response
 
-from quiz.models import Quiz, Category, Progress, Sitting, Question
+from .models import Quiz, Category, Progress, Sitting, Question
 
 
 def index(request):

diff --git a/true_false/tests.py b/true_false/tests.py
index c9f62bdb4f216b904445f8a1442d151c8e3fe675..5880761a6e9f747ea7ff1df883de04fe66500378 100644 (file)
--- a/true_false/tests.py
+++ b/true_false/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from true_false.models import TF_Question
+from .models import TF_Question
 
 
 class TestTrueFalseQuestionModel(TestCase):