Commit d362c154 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Convert much of the regression tests to use absolute imports. There's still...

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
parent d5a45d79
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
from django.core.paginator import Paginator
from __future__ import absolute_import

from django.contrib import admin
from django.core.paginator import Paginator

from models import (Child, Parent, Genre, Band, Musician, Group, Quartet,
from .models import (Child, Parent, Genre, Band, Musician, Group, Quartet,
    Membership, ChordsMusician, ChordsBand, Invitation)


site = admin.AdminSite(name="admin")

class CustomPaginator(Paginator):
+1 −0
Original line number Diff line number Diff line
from django.db import models


class Parent(models.Model):
    name = models.CharField(max_length=128)

+5 −6
Original line number Diff line number Diff line
from __future__ import with_statement
from __future__ import with_statement, absolute_import

from django.contrib import admin
from django.contrib.admin.options import IncorrectLookupParameters
from django.contrib.admin.views.main import ChangeList, SEARCH_VAR, ALL_VAR
from django.contrib.auth.models import User
from django.template import Context, Template
from django.test import TestCase
from django.test.client import RequestFactory
from django.contrib.auth.models import User

from models import (Child, Parent, Genre, Band, Musician, Group, Quartet,
    Membership, ChordsMusician, ChordsBand, Invitation)

from admin import (ChildAdmin, QuartetAdmin, BandAdmin, ChordsBandAdmin,
from .admin import (ChildAdmin, QuartetAdmin, BandAdmin, ChordsBandAdmin,
    GroupAdmin, ParentAdmin, DynamicListDisplayChildAdmin, CustomPaginationAdmin,
    FilteredChildAdmin, CustomPaginator, site as custom_site)
from .models import (Child, Parent, Genre, Band, Musician, Group, Quartet,
    Membership, ChordsMusician, ChordsBand, Invitation)


class ChangeListTests(TestCase):
+2 −1
Original line number Diff line number Diff line
from django.conf.urls import patterns, include

import admin
from . import admin


urlpatterns = patterns('',
    (r'^admin/', include(admin.site.urls)),
+3 −1
Original line number Diff line number Diff line
from __future__ import absolute_import

from django.core.urlresolvers import reverse
from django.template.response import TemplateResponse
from django.test import TestCase

from models import Action
from .models import Action


class AdminCustomUrlsTest(TestCase):
Loading