From 90720d549ad4be578e935cd029e38b72c020e30b Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 23 Dec 2014 18:43:55 +0100 Subject: [PATCH] Removed admin_util test dependency on contrib.sites --- tests/admin_util/models.py | 10 +++++++++- tests/admin_util/tests.py | 3 +-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/admin_util/models.py b/tests/admin_util/models.py index 05fb7c4efb..ce845c64eb 100644 --- a/tests/admin_util/models.py +++ b/tests/admin_util/models.py @@ -3,11 +3,19 @@ from django.utils import six from django.utils.encoding import python_2_unicode_compatible +@python_2_unicode_compatible +class Site(models.Model): + domain = models.CharField(max_length=100) + + def __str__(self): + return self.domain + + class Article(models.Model): """ A simple Article model for testing """ - site = models.ForeignKey('sites.Site', related_name="admin_articles") + site = models.ForeignKey(Site, related_name="admin_articles") title = models.CharField(max_length=100) title2 = models.CharField(max_length=100, verbose_name="another name") created = models.DateTimeField() diff --git a/tests/admin_util/tests.py b/tests/admin_util/tests.py index 4d2b2d1edf..dd2130e484 100644 --- a/tests/admin_util/tests.py +++ b/tests/admin_util/tests.py @@ -8,7 +8,6 @@ from django.contrib.admin import helpers from django.contrib.admin.utils import (display_for_field, flatten, flatten_fieldsets, label_for_field, lookup_field, NestedObjects) from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE -from django.contrib.sites.models import Site from django.db import models, DEFAULT_DB_ALIAS from django import forms from django.test import TestCase @@ -16,7 +15,7 @@ from django.utils.formats import localize from django.utils.safestring import mark_safe from django.utils import six -from .models import Article, Count, Event, Location, EventGuide, Vehicle, Car +from .models import Site, Article, Count, Event, Location, EventGuide, Vehicle, Car class NestedObjectsTests(TestCase):