Commit 8c0eefd0 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Convert the remainder of the relative imports in the tests to be absolute imports.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f8301661
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
from __future__ import absolute_import

from django.contrib import admin
from django.contrib.contenttypes import generic

from models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact,
from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact,
    Category, EpisodePermanent, EpisodeMaxNum)


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

class MediaInline(generic.GenericTabularInline):
+1 −1
Original line number Diff line number Diff line
from django.db import models
from django.contrib.contenttypes import generic
from django.contrib.contenttypes.models import ContentType
from django.db import models


class Episode(models.Model):
+4 −2
Original line number Diff line number Diff line
# coding: utf-8

from __future__ import absolute_import

from django.conf import settings
from django.contrib import admin
from django.contrib.admin.sites import AdminSite
@@ -9,9 +11,9 @@ from django.forms.models import ModelForm
from django.test import TestCase

# local test models
from models import (Episode, EpisodeExtra, EpisodeMaxNum, Media,
from .admin import MediaInline, MediaPermanentInline
from .models import (Episode, EpisodeExtra, EpisodeMaxNum, Media,
    EpisodePermanent, Category)
from admin import MediaInline, MediaPermanentInline


class GenericAdminViewTest(TestCase):
+3 −1
Original line number Diff line number Diff line
from __future__ import absolute_import

from django.conf.urls import patterns, include

import admin
from . import admin

urlpatterns = patterns('',
    (r'^generic_inline_admin/admin/', include(admin.site.urls)),
+4 −3
Original line number Diff line number Diff line
from django.db import models
from django.contrib.contenttypes import generic
from django.contrib.contenttypes.models import ContentType
from django.db import models


__all__ = ('Link', 'Place', 'Restaurant', 'Person', 'Address',
           'CharLink', 'TextLink', 'OddRelation1', 'OddRelation2',
Loading