From 737a317a232252512b7fda9d61cb39d0e3ebf8e8 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Tue, 11 Apr 2006 12:39:59 +0000 Subject: [PATCH] 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 --- django/core/management.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/django/core/management.py b/django/core/management.py index 235ad4c0c4..1315cea036 100644 --- a/django/core/management.py +++ b/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]: