Commit 73130e3

committed

Fixed case where a missing meta_field value would error

1 parent 3b93077 commit 73130e3Copy full SHA for 73130e3

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ def extract_meta(serializer, resource):`
`325`	`325`	`meta = getattr(serializer.child, 'Meta', None)`
`326`	`326`	`else:`
`327`	`327`	`meta = getattr(serializer, 'Meta', None)`
`328`		`- meta_fields = getattr(meta, 'meta_fields', {})`
	`328`	`+ meta_fields = getattr(meta, 'meta_fields', [])`
`329`	`329`	`data = OrderedDict()`
`330`	`330`	`for field_name in meta_fields:`
`331`	`331`	`data.update({`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,10 @@ def get_field_names(self, declared_fields, info):`
`148`	`148`	`We override the parent to omit explicity defined meta fields (such`
`149`	`149`	`as SerializerMethodFields) from the list of declared fields`
`150`	`150`	`"""`
`151`		`- meta_fields = getattr(self.Meta, 'meta_fields', None)`
	`151`	`+ meta_fields = getattr(self.Meta, 'meta_fields', [])`
`152`	`152`
`153`	`153`	`declared = OrderedDict()`
`154`		`- for field_name in declared_fields.keys():`
	`154`	`+ for field_name in set(declared_fields.keys()):`
`155`	`155`	`field = declared_fields[field_name]`
`156`	`156`	`if field_name not in meta_fields:`
`157`	`157`	`declared[field_name] = field`

Comments

(0)