Skip to content

Commit 16565e2

Browse files
committed
bump version to 2.1.7 and simplify
1 parent 21192f8 commit 16565e2

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

dynamic_rest/filters.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,7 @@ def _get_requested_filters(self, **kwargs):
263263
self.view.FILTER
264264
)
265265
if getattr(self, 'view', None):
266-
advanced_filters = self.view.get_request_feature(self.view.FILTER, raw=True)
267-
if advanced_filters:
268-
out['_complex'] = advanced_filters
266+
out['_complex'] = self.view.get_request_feature(self.view.FILTER, raw=True)
269267

270268
for spec, value in six.iteritems(filters_map):
271269

@@ -336,7 +334,7 @@ def _filters_to_query(self, filters, serializer, q=None):
336334
"""
337335

338336
if (
339-
'_complex' not in filters
337+
not filters.get('_complex')
340338
):
341339
includes = filters.get('_include')
342340
excludes = filters.get('_exclude')

dynamic_rest/viewsets.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ def _extract_object_params(self, name, raw=False):
180180
"""
181181
Extract object params, return as dict
182182
"""
183-
184183
params = self.request.query_params.lists()
185184
params_map = {}
186185
original_name = name

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
NAME = 'dynamic-rest'
44
DESCRIPTION = 'Dynamic API support to Django REST Framework.'
55
URL = 'http://github.com/AltSchool/dynamic-rest'
6-
VERSION = '2.1.6'
6+
VERSION = '2.1.7'
77
SCRIPTS = ['manage.py']
88

99
setup(

0 commit comments

Comments
 (0)