diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-03 02:50:23 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-03 02:50:23 +0000 |
| commit | dcb0884d682edac06d15e427394afc8e92844152 (patch) | |
| tree | 69e274b19f7a0778a9f5048d7f24e764552aac55 /django | |
| parent | 9e6d32eddeb11cfaf9b817f105633a3f3779a80c (diff) | |
[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
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/gis/utils/geoip.py | 2 | ||||
| -rw-r--r-- | django/core/management/commands/diffsettings.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/gis/utils/geoip.py b/django/contrib/gis/utils/geoip.py index 4d163aab9a..8c21ab290a 100644 --- a/django/contrib/gis/utils/geoip.py +++ b/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)) 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 = [] |