Commit cad7622

committed

Fix merge duplicates

1 parent c4f4a03 commit cad7622Copy full SHA for cad7622

File tree

-11

lines changed

-11

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,6 @@ def test_default_included_data_on_list(multiple_entries, client):`
`11`	`11`	`)`
`12`	`12`
`13`	`13`
`14`		`-def test_included_data_on_list(multiple_entries, client, query='?include=comments&page_size=5'):`
`15`		`- response = client.get(reverse("entry-list") + query)`
`16`		`-`
`17`		`-`
`18`	`14`	`def test_included_data_on_list(multiple_entries, client, query='?include=comments&page_size=5'):`
`19`	`15`	`response = client.get(reverse("entry-list") + query)`
`20`	`16`	`included = response.json().get('included')`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -340,13 +340,6 @@ def get_default_included_resources_from_serializer(serializer):`
`340`	`340`	`return list(getattr(meta, 'included_resources', []))`
`341`	`341`
`342`	`342`
`343`		`-def get_default_included_resources_from_serializer(serializer):`
`344`		`- try:`
`345`		`- return list(serializer.JSONAPIMeta.included_resources)`
`346`		`- except AttributeError:`
`347`		`- return []`
`348`		`-`
`349`		`-`
`350`	`343`	`def get_included_serializers(serializer):`
`351`	`344`	`included_serializers = copy.copy(getattr(serializer, 'included_serializers', dict()))`
`352`	`345`

Comments

(0)