mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-19 09:09:13 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Malcolm Tredinnick 2009-03-03 02:50:23 +00:00
parent 9e6d32edde
commit dcb0884d68
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/utils/geoip.py
View File

@ -42,7 +42,7 @@ import os, re
from ctypes import c_char_p, c_float, c_int, Structure, CDLL, POINTER from ctypes import c_char_p, c_float, c_int, Structure, CDLL, POINTER
from ctypes.util import find_library from ctypes.util import find_library
from django.conf import settings 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. # Creating the settings dictionary with any settings, if needed.
GEOIP_SETTINGS = dict((key, getattr(settings, key)) GEOIP_SETTINGS = dict((key, getattr(settings, key))

4
django/core/management/commands/diffsettings.py
View File

@ -16,9 +16,9 @@ class Command(NoArgsCommand):
from django.conf import settings, global_settings from django.conf import settings, global_settings
# Because settings are imported lazily, we need to explicitly load them. # 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) default_settings = module_to_dict(global_settings)
output = [] output = []