Skip to content

Order #1094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Order #1094

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions rest_framework_json_api/metadata.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from collections import OrderedDict

from django.db.models.fields import related
from django.utils.encoding import force_str
from rest_framework import serializers
Expand Down Expand Up @@ -65,7 +63,7 @@ class JSONAPIMetadata(SimpleMetadata):
)

def determine_metadata(self, request, view):
metadata = OrderedDict()
metadata = {}
metadata["name"] = view.get_view_name()
metadata["description"] = view.get_view_description()
metadata["renders"] = [
Expand All @@ -92,19 +90,19 @@ def get_serializer_info(self, serializer):
# Remove the URL field if present
serializer.fields.pop(api_settings.URL_FIELD_NAME, None)

return OrderedDict(
return {
[
(format_field_name(field_name), self.get_field_info(field))
for field_name, field in serializer.fields.items()
]
)
}

def get_field_info(self, field):
"""
Given an instance of a serializer field, return a dictionary
of metadata about it.
"""
field_info = OrderedDict()
field_info = {}
serializer = field.parent

if isinstance(field, serializers.ManyRelatedField):
Expand Down
17 changes: 8 additions & 9 deletions rest_framework_json_api/pagination.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""
Pagination fields
"""
from collections import OrderedDict

from rest_framework.pagination import LimitOffsetPagination, PageNumberPagination
from rest_framework.utils.urls import remove_query_param, replace_query_param
Expand Down Expand Up @@ -36,22 +35,22 @@ def get_paginated_response(self, data):
{
"results": data,
"meta": {
"pagination": OrderedDict(
"pagination": {
[
("page", self.page.number),
("pages", self.page.paginator.num_pages),
("count", self.page.paginator.count),
]
)
}
},
"links": OrderedDict(
"links": {
[
("first", self.build_link(1)),
("last", self.build_link(self.page.paginator.num_pages)),
("next", self.build_link(next)),
("prev", self.build_link(previous)),
]
),
},
}
)

Expand Down Expand Up @@ -97,21 +96,21 @@ def get_paginated_response(self, data):
{
"results": data,
"meta": {
"pagination": OrderedDict(
"pagination": {
[
("count", self.count),
("limit", self.limit),
("offset", self.offset),
]
)
}
},
"links": OrderedDict(
"links": {
[
("first", self.get_first_link()),
("last", self.get_last_link()),
("next", self.get_next_link()),
("prev", self.get_previous_link()),
]
),
},
}
)
9 changes: 4 additions & 5 deletions rest_framework_json_api/relations.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import json
from collections import OrderedDict

import inflection
from django.core.exceptions import ImproperlyConfigured
Expand Down Expand Up @@ -104,7 +103,7 @@ def get_url(self, name, view_name, kwargs, request):
def get_links(self, obj=None, lookup_field="pk"):
request = self.context.get("request", None)
view = self.context.get("view", None)
return_data = OrderedDict()
return_data = {}

kwargs = {
lookup_field: getattr(obj, lookup_field)
Expand Down Expand Up @@ -257,7 +256,7 @@ def to_representation(self, value):
if resource_type is None or not self._skip_polymorphic_optimization:
resource_type = get_resource_type_from_instance(value)

return OrderedDict([("type", resource_type), ("id", str(pk))])
return {[("type", resource_type), ("id", str(pk))]}

def get_resource_type_from_included_serializer(self):
"""
Expand Down Expand Up @@ -301,12 +300,12 @@ def get_choices(self, cutoff=None):
if cutoff is not None:
queryset = queryset[:cutoff]

return OrderedDict(
return {
[
(json.dumps(self.to_representation(item)), self.display_value(item))
for item in queryset
]
)
}


class PolymorphicResourceRelatedField(ResourceRelatedField):
Expand Down