[1.0.X] Final pieces (he says, hopefully) of r9945 changes.

Fixed "django-admin.py diffsettings" and some GeoDjango stuff.
Refs #10395.

Backport of r9960 and r9961 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9962 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/gis/utils/geoip.py

@@ -42,7 +42,7 @@ import os, re
 from ctypes import c_char_p, c_float, c_int, Structure, CDLL, POINTER
 from ctypes.util import find_library
 from django.conf import settings
-if not settings._target: settings.configure()
+if not settings.configured: settings.configure()
 
 # Creating the settings dictionary with any settings, if needed.
 GEOIP_SETTINGS = dict((key, getattr(settings, key)) 

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