Commit 86d4352

committed

Fix merge

1 parent cad7622 commit 86d4352Copy full SHA for 86d4352

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -440,9 +440,7 @@ def format_drf_errors(response, context, exc):`
`440`	`440`	`status=encoding.force_text(response.status_code),`
`441`	`441`	`source='/included/%s' % identifier))`
`442`	`442`	`else:`
`443`		`- errors.extend(_format_nested_error(error,`
`444`		`- status=encoding.force_text(response.status_code),`
`445`		`- source='/data/%s' % field))`
	`443`	`+ errors.append(error)`
`446`	`444`	`elif isinstance(error, six.string_types):`
`447`	`445`	`classes = inspect.getmembers(exceptions, inspect.isclass)`
`448`	`446`	# DRF sets the `field` to 'detail' for its own exceptions

Comments

(0)