Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 737a317a232252512b7fda9d61cb39d0e3ebf8e8 1 parent 1735b0c
@adrianholovaty adrianholovaty authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 django/core/management.py
View
7 django/core/management.py
@@ -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]:
Please sign in to comment.
Something went wrong with that request. Please try again.