Commitc655de2

committed

Raise ImproperlyConfigured when missing serializer_class

get_serializer_class raises an AssertionError if no serializer_classis found (either as a class attribute or from an overriding method).This commit catches it and raises ImproperlyConfigured instead.

1 parentc6b5ae0 commitc655de2Copy full SHA for c655de2

File tree

2 files changed

-9

lines changed

rest_framework
- filters.py
tests
- test_filters.py

2 files changed

-9

lines changed

`‎rest_framework/filters.py‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -158,14 +158,14 @@ def remove_invalid_fields(self, queryset, fields, view):`
`158`	`158`
`159`	`159`	`ifvalid_fieldsisNone:`
`160`	`160`	`# Default to allowing filtering on serializer fields`
`161`		`-serializer_class=getattr(view,'serializer_class')`
`162`		`-ifserializer_classisNone:`
	`161`	`+try:`
`163`	`162`	`serializer_class=view.get_serializer_class()`
`164`		`-ifserializer_classisNone:`
`165`		`-msg= ("Cannot use %s on a view which does not have either a "`
`166`		`-"'serializer_class', an overriding 'get_serializer_class' "`
`167`		`-"or 'ordering_fields' attribute.")`
`168`		`-raiseImproperlyConfigured(msg%self.__class__.__name__)`
	`163`	`+exceptAssertionError:# raised if no serializer_class was found`
	`164`	`+msg= ("Cannot use %s on a view which does not have either a "`
	`165`	`+"'serializer_class', an overriding 'get_serializer_class' "`
	`166`	`+"or 'ordering_fields' attribute.")`
	`167`	`+raiseImproperlyConfigured(msg%self.__class__.__name__)`
	`168`	`+`
`169`	`169`	`valid_fields= [`
`170`	`170`	`field.sourceorfield_name`
`171`	`171`	`forfield_name,fieldinserializer_class().fields.items()`

`‎tests/test_filters.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`fromdecimalimportDecimal`
`6`	`6`
`7`	`7`	`fromdjango.conf.urlsimporturl`
	`8`	`+fromdjango.core.exceptionsimportImproperlyConfigured`
`8`	`9`	`fromdjango.core.urlresolversimportreverse`
`9`	`10`	`fromdjango.dbimportmodels`
`10`	`11`	`fromdjango.testimportTestCase`
`@@ -773,8 +774,7 @@ class OrderingListView(generics.ListAPIView):`
`773`	`774`
`774`	`775`	`view=OrderingListView.as_view()`
`775`	`776`	`request=factory.get('/', {'ordering':'text'})`
`776`		`-# BUG: I think this should raise ImproperlyConfigured`
`777`		`-withself.assertRaises(AssertionError):`
	`777`	`+withself.assertRaises(ImproperlyConfigured):`
`778`	`778`	`view(request)`
`779`	`779`
`780`	`780`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc655de2

File tree

2 files changed

2 files changed

`‎rest_framework/filters.py‎`

`‎tests/test_filters.py‎`

0 commit comments