From 53678ef5083a20955e3f0192bbe9005cc7abbded Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Thu, 21 Apr 2011 17:43:22 +0000 Subject: [PATCH] [1.3.X] Refs #15573, #15850: Added a check for whether the sites app is installed when creating the test database, in order to work around a bug in get_model. Thanks to adsva and carljm. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16062 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/creation.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py index 75f07926c1..57e3f7762d 100644 --- a/django/db/backends/creation.py +++ b/django/db/backends/creation.py @@ -379,9 +379,10 @@ class BaseDatabaseCreation(object): # default site may or may not be 1, depending on how the sequence was # reset. If the sites app is loaded, then we coerce it. from django.db.models import get_model - Site = get_model('sites', 'Site') - if Site is not None and Site.objects.using(self.connection.alias).count() == 1: - Site.objects.using(self.connection.alias).update(id=settings.SITE_ID) + if 'django.contrib.sites' in settings.INSTALLED_APPS: + Site = get_model('sites', 'Site') + if Site is not None and Site.objects.using(self.connection.alias).count() == 1: + Site.objects.using(self.connection.alias).update(id=settings.SITE_ID) from django.core.cache import get_cache from django.core.cache.backends.db import BaseDatabaseCache