From 7b55da05011bafe90f66925b8c29caf566e06510 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Tue, 3 Mar 2009 02:48:02 +0000 Subject: [PATCH] Final piece (he says, hopefully) of r9945 changes. This time, "django-admin.py diffsettings" is fixed. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9961 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/management/commands/diffsettings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/core/management/commands/diffsettings.py b/django/core/management/commands/diffsettings.py index 2459f11700..70fe8d4677 100644 --- a/django/core/management/commands/diffsettings.py +++ b/django/core/management/commands/diffsettings.py @@ -16,9 +16,9 @@ class Command(NoArgsCommand): from django.conf import settings, global_settings # Because settings are imported lazily, we need to explicitly load them. - settings._import_settings() + settings._setup() - user_settings = module_to_dict(settings._target) + user_settings = module_to_dict(settings._wrapped) default_settings = module_to_dict(global_settings) output = []