mirror of
https://github.com/django/django.git
synced 2025-10-23 21:59:11 +00:00
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
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# coding: utf-8
|
||||
from __future__ import with_statement
|
||||
from __future__ import with_statement, absolute_import
|
||||
|
||||
import re
|
||||
import datetime
|
||||
@@ -11,39 +11,37 @@ from django.core.exceptions import SuspiciousOperation
|
||||
from django.core.files import temp as tempfile
|
||||
from django.core.urlresolvers import reverse
|
||||
# Register auth models with the admin.
|
||||
from django.contrib.auth import REDIRECT_FIELD_NAME, admin
|
||||
from django.contrib.auth.models import Group, User, Permission, UNUSABLE_PASSWORD
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
|
||||
from django.contrib.admin.models import LogEntry, DELETION
|
||||
from django.contrib.admin.sites import LOGIN_FORM_KEY
|
||||
from django.contrib.admin.util import quote
|
||||
from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
|
||||
from django.contrib.admin.views.main import IS_POPUP_VAR
|
||||
from django.contrib.auth import REDIRECT_FIELD_NAME, admin
|
||||
from django.contrib.auth.models import Group, User, Permission, UNUSABLE_PASSWORD
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.forms.util import ErrorList
|
||||
import django.template.context
|
||||
from django.template import context as context_module
|
||||
from django.template.response import TemplateResponse
|
||||
from django.test import TestCase
|
||||
from django.utils import formats, translation
|
||||
from django.utils import formats, translation, unittest
|
||||
from django.utils.cache import get_max_age
|
||||
from django.utils.encoding import iri_to_uri
|
||||
from django.utils.html import escape
|
||||
from django.utils.http import urlencode
|
||||
from django.utils import unittest
|
||||
|
||||
# local test models
|
||||
from models import (Article, BarAccount, CustomArticle, EmptyModel,
|
||||
FooAccount, Gallery, ModelWithStringPrimaryKey,
|
||||
Person, Persona, Picture, Podcast, Section, Subscriber, Vodcast,
|
||||
Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit,
|
||||
Category, Post, Plot, FunkyTag, Chapter, Book, Promo, WorkHour, Employee,
|
||||
Question, Answer, Inquisition, Actor, FoodDelivery,
|
||||
RowLevelChangePermissionModel, Paper, CoverLetter, Story, OtherStory,
|
||||
ComplexSortedPerson, Parent, Child)
|
||||
from .models import (Article, BarAccount, CustomArticle, EmptyModel, FooAccount,
|
||||
Gallery, ModelWithStringPrimaryKey, Person, Persona, Picture, Podcast,
|
||||
Section, Subscriber, Vodcast, Language, Collector, Widget, Grommet,
|
||||
DooHickey, FancyDoodad, Whatsit, Category, Post, Plot, FunkyTag, Chapter,
|
||||
Book, Promo, WorkHour, Employee, Question, Answer, Inquisition, Actor,
|
||||
FoodDelivery, RowLevelChangePermissionModel, Paper, CoverLetter, Story,
|
||||
OtherStory, ComplexSortedPerson, Parent, Child)
|
||||
|
||||
|
||||
ERROR_MESSAGE = "Please enter the correct username and password \
|
||||
for a staff account. Note that both fields are case-sensitive."
|
||||
|
||||
|
||||
class AdminViewBasicTest(TestCase):
|
||||
fixtures = ['admin-views-users.xml', 'admin-views-colors.xml',
|
||||
'admin-views-fabrics.xml', 'admin-views-books.xml']
|
||||
@@ -3073,7 +3071,7 @@ class ValidXHTMLTests(TestCase):
|
||||
cp.remove('django.core.context_processors.i18n')
|
||||
settings.TEMPLATE_CONTEXT_PROCESSORS = tuple(cp)
|
||||
# Force re-evaluation of the contex processor list
|
||||
django.template.context._standard_context_processors = None
|
||||
context_module._standard_context_processors = None
|
||||
self.client.login(username='super', password='secret')
|
||||
|
||||
def tearDown(self):
|
||||
@@ -3081,7 +3079,7 @@ class ValidXHTMLTests(TestCase):
|
||||
if self._context_processors is not None:
|
||||
settings.TEMPLATE_CONTEXT_PROCESSORS = self._context_processors
|
||||
# Force re-evaluation of the contex processor list
|
||||
django.template.context._standard_context_processors = None
|
||||
context_module._standard_context_processors = None
|
||||
settings.USE_I18N = self._use_i18n
|
||||
|
||||
def testLangNamePresent(self):
|
||||
|
||||
Reference in New Issue
Block a user