diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-13 18:51:33 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-13 18:51:33 +0000 |
| commit | d362c1546f8ad62811e5dee3cf0b43170e6e1c4c (patch) | |
| tree | c14af91e991cb534a135cc0ca467aa6263007b07 /tests/regressiontests/conditional_processing | |
| parent | d5a45d79fe03cad93ab5761860e9bb6fc1db4c86 (diff) | |
Convert much of the regression tests to use absolute imports. There's still work to be done though.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/conditional_processing')
| -rw-r--r-- | tests/regressiontests/conditional_processing/models.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/conditional_processing/urls.py | 4 | ||||
| -rw-r--r-- | tests/regressiontests/conditional_processing/views.py | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/tests/regressiontests/conditional_processing/models.py b/tests/regressiontests/conditional_processing/models.py index 0f9bb52b52..f7f48bc9c8 100644 --- a/tests/regressiontests/conditional_processing/models.py +++ b/tests/regressiontests/conditional_processing/models.py @@ -5,6 +5,7 @@ from django.test import TestCase from django.utils import unittest from django.utils.http import parse_etags, quote_etag, parse_http_date + FULL_RESPONSE = 'Test conditional get response' LAST_MODIFIED = datetime(2007, 10, 21, 23, 21, 47) LAST_MODIFIED_STR = 'Sun, 21 Oct 2007 23:21:47 GMT' @@ -14,7 +15,6 @@ EXPIRED_LAST_MODIFIED_STR = 'Sat, 20 Oct 2007 23:21:47 GMT' ETAG = 'b4246ffc4f62314ca13147c9d4f76974' EXPIRED_ETAG = '7fae4cd4b0f81e7d2914700043aa8ed6' - class ConditionalGet(TestCase): urls = 'regressiontests.conditional_processing.urls' diff --git a/tests/regressiontests/conditional_processing/urls.py b/tests/regressiontests/conditional_processing/urls.py index d84030e393..1ed7b1264a 100644 --- a/tests/regressiontests/conditional_processing/urls.py +++ b/tests/regressiontests/conditional_processing/urls.py @@ -1,5 +1,7 @@ from django.conf.urls import patterns -import views + +from . import views + urlpatterns = patterns('', ('^condition/$', views.index), diff --git a/tests/regressiontests/conditional_processing/views.py b/tests/regressiontests/conditional_processing/views.py index df4928133d..2188c9b462 100644 --- a/tests/regressiontests/conditional_processing/views.py +++ b/tests/regressiontests/conditional_processing/views.py @@ -1,8 +1,11 @@ # -*- coding:utf-8 -*- +from __future__ import absolute_import + from django.views.decorators.http import condition, etag, last_modified from django.http import HttpResponse -from models import FULL_RESPONSE, LAST_MODIFIED, ETAG +from .models import FULL_RESPONSE, LAST_MODIFIED, ETAG + def index(request): return HttpResponse(FULL_RESPONSE) |
