Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Adrian Holovaty authored April 11, 2006

Showing 1 changed file with 4 additions and 3 deletions. Show diff stats Hide diff stats

  1. 7  django/core/management.py
7  django/core/management.py
@@ -525,14 +525,15 @@ def diffsettings():
525 525
     followed by "###".
526 526
     """
527 527
     # Inspired by Postfix's "postconf -n".
528  
-    from django.conf import settings
529  
-    from django.conf import global_settings
  528
+    from django.conf import settings, global_settings
530 529
 
531 530
     user_settings = _module_to_dict(settings)
532 531
     default_settings = _module_to_dict(global_settings)
533 532
 
534 533
     output = []
535  
-    for key in sorted(user_settings):
  534
+    keys = user_settings.keys()
  535
+    keys.sort()
  536
+    for key in keys:
536 537
         if key not in default_settings:
537 538
             output.append("%s = %s  ###" % (key, user_settings[key]))
538 539
         elif user_settings[key] != default_settings[key]:

0 notes on commit 737a317

Please sign in to comment.
Something went wrong with that request. Please try again.