mirror of
https://github.com/django/django.git
synced 2025-07-04 17:59:13 +00:00
magic-removal: Fixed #1549 -- Removed Python 2.4ism introduced in [2671]
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
1735b0cf69
commit
737a317a23
@ -525,14 +525,15 @@ def diffsettings():
|
||||
followed by "###".
|
||||
"""
|
||||
# Inspired by Postfix's "postconf -n".
|
||||
from django.conf import settings
|
||||
from django.conf import global_settings
|
||||
from django.conf import settings, global_settings
|
||||
|
||||
user_settings = _module_to_dict(settings)
|
||||
default_settings = _module_to_dict(global_settings)
|
||||
|
||||
output = []
|
||||
for key in sorted(user_settings):
|
||||
keys = user_settings.keys()
|
||||
keys.sort()
|
||||
for key in keys:
|
||||
if key not in default_settings:
|
||||
output.append("%s = %s ###" % (key, user_settings[key]))
|
||||
elif user_settings[key] != default_settings[key]:
|
||||
|
Loading…
x
Reference in New Issue
Block a user