mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Fixed #1549 -- Removed Python 2.4ism introduced in [2671]

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-04-11 12:39:59 +00:00
parent 1735b0cf69
commit 737a317a23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/core/management.py
View File

@ -525,14 +525,15 @@ def diffsettings():
followed by "###". followed by "###".
""" """
# Inspired by Postfix's "postconf -n". # Inspired by Postfix's "postconf -n".
from django.conf import settings from django.conf import settings, global_settings
from django.conf import global_settings
user_settings = _module_to_dict(settings) user_settings = _module_to_dict(settings)
default_settings = _module_to_dict(global_settings) default_settings = _module_to_dict(global_settings)
output = [] output = []
for key in sorted(user_settings): keys = user_settings.keys()
keys.sort()
for key in keys:
if key not in default_settings: if key not in default_settings:
output.append("%s = %s ###" % (key, user_settings[key])) output.append("%s = %s ###" % (key, user_settings[key]))
elif user_settings[key] != default_settings[key]: elif user_settings[key] != default_settings[key]: