Ticket #9928: 9928.diff

django/contrib/admin/sites.py

@@ -12 +12 @@
 from django.views.decorators.cache import never_cache
 from django.conf import settings
 from django.utils.hashcompat import md5_constructor
+from django.utils.datastructures import SortedDict
 
 ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.")
 LOGIN_FORM_KEY = 'this_is_the_login_form'
@@ -35 +36 @@
     app_index_template = None
 
     def __init__(self):
-        self._registry = {} # model_class class -> admin_class instance
+        self._registry = SortedDict({}) # model_class class -> admin_class instance
 
     def register(self, model_or_iterable, admin_class=None, **options):
         """
@@ -304 +305 @@
         app_list = app_dict.values()
         app_list.sort(lambda x, y: cmp(x['name'], y['name']))
 
-        # Sort the models alphabetically within each app.
-        for app in app_list:
-            app['models'].sort(lambda x, y: cmp(x['name'], y['name']))
-
         context = {
             'title': _('Site administration'),
             'app_list': app_list,

django/contrib/databrowse/sites.py

@@ -3 +3 @@
 from django.contrib.databrowse.datastructures import EasyModel
 from django.shortcuts import render_to_response
 from django.utils.safestring import mark_safe
+from django.utils.datastructures import SortedDict
 
 class AlreadyRegistered(Exception):
     pass
@@ -70 +71 @@
 
 class DatabrowseSite(object):
     def __init__(self):
-        self.registry = {} # model_class -> databrowse_class
+        self.registry = SortedDict({}) # model_class -> databrowse_class
         self.root_url = None
 
     def register(self, model_or_iterable, databrowse_class=None, **options):