diff options
| author | Tom Christie | 2014-10-31 15:19:15 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-10-31 15:19:15 +0000 |
| commit | 159c3de9fc25c63e6e0ca1fe6b0cea26ea38a070 (patch) | |
| tree | 31bba829b2e2cad5917607b22cd4bbc4cb80548e /rest_framework/routers.py | |
| parent | 45b5f23f3142c1b63258c8ad092887538eee5517 (diff) | |
| parent | 4ad4fca6cec66b8f088921404e6896ee0b324a03 (diff) | |
| download | django-rest-framework-159c3de9fc25c63e6e0ca1fe6b0cea26ea38a070.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/routers.py')
| -rw-r--r-- | rest_framework/routers.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rest_framework/routers.py b/rest_framework/routers.py index f2d06211..169e6e8b 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -20,6 +20,7 @@ from collections import namedtuple from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import NoReverseMatch +from django.utils.datastructures import SortedDict from rest_framework import views from rest_framework.response import Response from rest_framework.reverse import reverse @@ -277,7 +278,7 @@ class DefaultRouter(SimpleRouter): """ Return a view to use as the API root. """ - api_root_dict = {} + api_root_dict = SortedDict() list_name = self.routes[0].name for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) @@ -286,7 +287,7 @@ class DefaultRouter(SimpleRouter): _ignore_model_permissions = True def get(self, request, *args, **kwargs): - ret = {} + ret = SortedDict() for key, url_name in api_root_dict.items(): try: ret[key] = reverse( |
