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

@@ -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 = []