Commit 8f32502

committed

Removed OrderedDict in serializers, utils and views

1 parent 3d01f0c commit 8f32502Copy full SHA for 8f32502

File tree

+17

-36

lines changed

+17

-36

lines changed

Lines changed: 2 additions & 3 deletions

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

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import inspect`
`2`	`2`	`import operator`
`3`		`-from collections import OrderedDict`
`4`	`3`
`5`	`4`	`import inflection`
`6`	`5`	`from django.conf import settings`
`@@ -107,11 +106,7 @@ def format_field_names(obj, format_type=None):`
`107`	`106`	`format_type = json_api_settings.FORMAT_FIELD_NAMES`
`108`	`107`
`109`	`108`	`if isinstance(obj, dict):`
`110`		`- formatted = OrderedDict()`
`111`		`- for key, value in obj.items():`
`112`		`- key = format_value(key, format_type)`
`113`		`- formatted[key] = value`
`114`		`- return formatted`
	`109`	`+ return {format_value(key, format_type): value for key, value in obj.items()}`
`115`	`110`
`116`	`111`	`return obj`
`117`	`112`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`from rest_framework_json_api.serializers import ResourceIdentifierObjectSerializer`
`24`	`24`	`from rest_framework_json_api.utils import (`
`25`	`25`	`Hyperlink,`
`26`		`- OrderedDict,`
`27`	`26`	`get_included_resources,`
`28`	`27`	`get_resource_type_from_instance,`
`29`	`28`	`undo_format_link_segment,`
`@@ -275,7 +274,7 @@ def get_url(self, name, view_name, kwargs, request):`
`275`	`274`	`return Hyperlink(url, name)`
`276`	`275`
`277`	`276`	`def get_links(self):`
`278`		`- return_data = OrderedDict()`
	`277`	`+ return_data = {}`
`279`	`278`	`self_link = self.get_url(`
`280`	`279`	`"self", self.self_link_view_name, self.kwargs, self.request`
`281`	`280`	`)`
`@@ -284,9 +283,9 @@ def get_links(self):`
`284`	`283`	`"related", self.related_link_view_name, related_kwargs, self.request`
`285`	`284`	`)`
`286`	`285`	`if self_link:`
`287`		`- return_data.update({"self": self_link})`
	`286`	`+ return_data["self"] =self_link`
`288`	`287`	`if related_link:`
`289`		`- return_data.update({"related": related_link})`
	`288`	`+ return_data["related"] =related_link`
`290`	`289`	`return return_data`
`291`	`290`
`292`	`291`	`def get(self, request, args, *kwargs):`

Lines changed: 11 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from collections import OrderedDict`
`2`		`-`
`3`	`1`	`from rest_framework.request import Request`
`4`	`2`
`5`	`3`	`from rest_framework_json_api.pagination import JsonApiLimitOffsetPagination`
`@@ -27,28 +25,18 @@ def test_get_paginated_response(self, rf):`
`27`	`25`
`28`	`26`	`expected_content = {`
`29`	`27`	`"results": list(range(11, 16)),`
`30`		`- "links": OrderedDict(`
`31`		`- [`
`32`		`- ("first", "http://testserver/?page%5Blimit%5D=5"),`
`33`		`- (`
`34`		`- "last",`
`35`		`- "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=100",`
`36`		`- ),`
`37`		`- (`
`38`		`- "next",`
`39`		`- "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=15",`
`40`		`- ),`
`41`		`- ("prev", "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=5"),`
`42`		`- ]`
`43`		`- ),`
	`28`	`+ "links": {`
	`29`	`+ "first": "http://testserver/?page%5Blimit%5D=5",`
	`30`	`+ "last": "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=100",`
	`31`	`+ "next": "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=15",`
	`32`	`+ "prev": "http://testserver/?page%5Blimit%5D=5&page%5Boffset%5D=5",`
	`33`	`+ },`
`44`	`34`	`"meta": {`
`45`		`- "pagination": OrderedDict(`
`46`		`- [`
`47`		`- ("count", count),`
`48`		`- ("limit", limit),`
`49`		`- ("offset", offset),`
`50`		`- ]`
`51`		`- )`
	`35`	`+ "pagination": {`
	`36`	`+ "count": count,`
	`37`	`+ "limit": limit,`
	`38`	`+ "offset": offset,`
	`39`	`+ }`
`52`	`40`	`},`
`53`	`41`	`}`
`54`	`42`

Comments

(0)