Commit3578ba6

Ryan P Kilby

committed

Assert declared fields are not present in exclude

1 parent33d3bd9 commit3578ba6Copy full SHA for 3578ba6

File tree

+18

-4

lines changed

+18

-4

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1099,12 +1099,20 @@ def get_field_names(self, declared_fields, info):`
`1099`	`1099`	# Use the default set of field names if `Meta.fields` is not specified.
`1100`	`1100`	`fields=self.get_default_field_names(declared_fields,info)`
`1101`	`1101`
`1102`		`-# deduplicate field names (occurs when a declared fields matches a model field)`
`1103`		`-fields=list(OrderedDict.fromkeys(fields))`
`1104`		`-`
`1105`	`1102`	`ifexcludeisnotNone:`
`1106`	`1103`	# If `Meta.exclude` is included, then remove those fields.
`1107`	`1104`	`forfield_nameinexclude:`
	`1105`	`+assertfield_namenotinself._declared_fields, (`
	`1106`	`+"Cannot both declare the field '{field_name}' and include "`
	`1107`	`+"it in the {serializer_class} 'exclude' option. Remove the "`
	`1108`	`+"field or, if inherited from a parent serializer, disable "`
	`1109`	+"with `{field_name} = None`."
	`1110`	`+ .format(`
	`1111`	`+field_name=field_name,`
	`1112`	`+serializer_class=self.__class__.__name__`
	`1113`	`+ )`
	`1114`	`+ )`
	`1115`	`+`
`1108`	`1116`	`assertfield_nameinfields, (`
`1109`	`1117`	`"The field '{field_name}' was included on serializer "`
`1110`	`1118`	`"{serializer_class} in the 'exclude' option, but does "`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -908,7 +908,13 @@ class Meta:`
`908`	`908`	`model=MetaClassTestModel`
`909`	`909`	`exclude= ('text',)`
`910`	`910`
`911`		`-assertlist(ExampleSerializer().fields)== ['id']`
	`911`	`+expected= (`
	`912`	`+"Cannot both declare the field 'text' and include it in the "`
	`913`	`+"ExampleSerializer 'exclude' option. Remove the field or, if "`
	`914`	+"inherited from a parent serializer, disable with `text = None`."
	`915`	`+ )`
	`916`	`+withself.assertRaisesMessage(AssertionError,expected):`
	`917`	`+ExampleSerializer().fields`
`912`	`918`
`913`	`919`
`914`	`920`	`classIssue2704TestCase(TestCase):`

Comments

(0)