Skip to content

Commit 8df5424

Browse files
committed
Adjusted to dict syntax
1 parent 08a9bc4 commit 8df5424

File tree

3 files changed

+19
-31
lines changed

3 files changed

+19
-31
lines changed

rest_framework_json_api/metadata.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ def get_serializer_info(self, serializer):
9191
serializer.fields.pop(api_settings.URL_FIELD_NAME, None)
9292

9393
return {
94-
[
95-
(format_field_name(field_name), self.get_field_info(field))
96-
for field_name, field in serializer.fields.items()
97-
]
94+
format_field_name(field_name): self.get_field_info(field)
95+
for field_name, field in serializer.fields.items()
9896
}
9997

10098
def get_field_info(self, field):

rest_framework_json_api/pagination.py

+14-22
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,16 @@ def get_paginated_response(self, data):
3636
"results": data,
3737
"meta": {
3838
"pagination": {
39-
[
40-
("page", self.page.number),
41-
("pages", self.page.paginator.num_pages),
42-
("count", self.page.paginator.count),
43-
]
39+
"page": self.page.number,
40+
"pages": self.page.paginator.num_pages,
41+
"count": self.page.paginator.count,
4442
}
4543
},
4644
"links": {
47-
[
48-
("first", self.build_link(1)),
49-
("last", self.build_link(self.page.paginator.num_pages)),
50-
("next", self.build_link(next)),
51-
("prev", self.build_link(previous)),
52-
]
45+
"first": self.build_link(1),
46+
"last": self.build_link(self.page.paginator.num_pages),
47+
"next": self.build_link(next),
48+
"prev": self.build_link(previous),
5349
},
5450
}
5551
)
@@ -97,20 +93,16 @@ def get_paginated_response(self, data):
9793
"results": data,
9894
"meta": {
9995
"pagination": {
100-
[
101-
("count", self.count),
102-
("limit", self.limit),
103-
("offset", self.offset),
104-
]
96+
"count": self.count,
97+
"limit": self.limit,
98+
"offset": self.offset,
10599
}
106100
},
107101
"links": {
108-
[
109-
("first", self.get_first_link()),
110-
("last", self.get_last_link()),
111-
("next", self.get_next_link()),
112-
("prev", self.get_previous_link()),
113-
]
102+
"first": self.get_first_link(),
103+
"last": self.get_last_link(),
104+
"next": self.get_next_link(),
105+
"prev": self.get_previous_link(),
114106
},
115107
}
116108
)

rest_framework_json_api/relations.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def to_representation(self, value):
256256
if resource_type is None or not self._skip_polymorphic_optimization:
257257
resource_type = get_resource_type_from_instance(value)
258258

259-
return {[("type", resource_type), ("id", str(pk))]}
259+
return {"type": resource_type, "id": str(pk)}
260260

261261
def get_resource_type_from_included_serializer(self):
262262
"""
@@ -301,10 +301,8 @@ def get_choices(self, cutoff=None):
301301
queryset = queryset[:cutoff]
302302

303303
return {
304-
[
305-
(json.dumps(self.to_representation(item)), self.display_value(item))
306-
for item in queryset
307-
]
304+
json.dumps(self.to_representation(item)): self.display_value(item)
305+
for item in queryset
308306
}
309307

310308

0 commit comments

Comments
 (0)