Removed OrderedDict in serializers, utils and views

Author: sliverc

rest_framework_json_api/serializers.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from collections.abc import Mapping
 
 import inflection
@@ -95,7 +94,7 @@ def __init__(self, *args, **kwargs):
                 pass
             else:
                 fieldset = request.query_params.get(param_name).split(",")
-                # iterate over a *copy* of self.fields' underlying OrderedDict, because we may
+                # iterate over a *copy* of self.fields' underlying dict, because we may
                 # modify the original during the iteration.
                 # self.fields is a `rest_framework.utils.serializer_helpers.BindingDict`
                 for field_name, _field in self.fields.fields.copy().items():
@@ -305,7 +304,7 @@ def get_field_names(self, declared_fields, info):
         """
         meta_fields = getattr(self.Meta, "meta_fields", [])
 
-        declared = OrderedDict()
+        declared = {}
         for field_name in set(declared_fields.keys()):
             field = declared_fields[field_name]
             if field_name not in meta_fields:

rest_framework_json_api/utils.py

@@ -1,6 +1,5 @@
 import inspect
 import operator
-from collections import OrderedDict
 
 import inflection
 from django.conf import settings
@@ -107,11 +106,7 @@ def format_field_names(obj, format_type=None):
         format_type = json_api_settings.FORMAT_FIELD_NAMES
 
     if isinstance(obj, dict):
-        formatted = OrderedDict()
-        for key, value in obj.items():
-            key = format_value(key, format_type)
-            formatted[key] = value
-        return formatted
+        return {format_value(key, format_type): value for key, value in obj.items()}
 
     return obj
 

rest_framework_json_api/views.py

@@ -23,7 +23,6 @@
 from rest_framework_json_api.serializers import ResourceIdentifierObjectSerializer
 from rest_framework_json_api.utils import (
     Hyperlink,
-    OrderedDict,
     get_included_resources,
     get_resource_type_from_instance,
     undo_format_link_segment,
@@ -275,7 +274,7 @@ def get_url(self, name, view_name, kwargs, request):
         return Hyperlink(url, name)
 
     def get_links(self):
-        return_data = OrderedDict()
+        return_data = {}
         self_link = self.get_url(
             "self", self.self_link_view_name, self.kwargs, self.request
         )
@@ -284,9 +283,9 @@ def get_links(self):
             "related", self.related_link_view_name, related_kwargs, self.request
         )
         if self_link:
-            return_data.update({"self": self_link})
+            return_data["self"] = self_link
         if related_link:
-            return_data.update({"related": related_link})
+            return_data["related"] = related_link
         return return_data
 
     def get(self, request, *args, **kwargs):

tests/test_pagination.py

@@ -1,5 +1,3 @@
-from collections import OrderedDict
-
 from rest_framework.request import Request
 
 from rest_framework_json_api.pagination import JsonApiLimitOffsetPagination
@@ -27,28 +25,18 @@ def test_get_paginated_response(self, rf):
 
         expected_content = {
             "results": list(range(11, 16)),
-            "links": OrderedDict(
-                [
-                    ("first", "http://testserver/?page%5Blimit%5D=5"),
-                    (
-                        "last",
-                        "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=100",
-                    ),
-                    (
-                        "next",
-                        "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=15",
-                    ),
-                    ("prev", "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=5"),
-                ]
-            ),
+            "links": {
+                "first": "http://testserver/?page%5Blimit%5D=5",
+                "last": "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=100",
+                "next": "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=15",
+                "prev": "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=5",
+            },
             "meta": {
-                "pagination": OrderedDict(
-                    [
-                        ("count", count),
-                        ("limit", limit),
-                        ("offset", offset),
-                    ]
-                )
+                "pagination": {
+                    "count": count,
+                    "limit": limit,
+                    "offset": offset,
+                }
             },
         }