Skip to content

Commit

Permalink
In the updated OrderingFilter class, rename _params to params to matc…
Browse files Browse the repository at this point in the history 
…h the style of existing code
  • Loading branch information
@earshinov
earshinov committed Dec 24, 2019
1 parent 33a500e commit edda682
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions django_filters/filters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ def __init__(self, *args, **kwargs):
else:
params = self.normalize_params(kwargs['params'])

self._params = params
self.params = params

if 'choices' not in kwargs:
kwargs['choices'] = self.build_choices(params)
Expand Down Expand Up @@ -887,7 +887,7 @@ def filter(self, qs, value):
def get_ordering_exprs(self, param_name):
descending = param_name.startswith('-')
param_name = param_name[1:] if descending else param_name
descriptor = self._params.get(param_name)
descriptor = self.params.get(param_name)
# For backward compatibility order by param_name if descriptor is not found
exprs = descriptor['exprs'] if descriptor is not None else (F(param_name),)
if descending:
Expand Down
34 changes: 17 additions & 17 deletions tests/test_filters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1678,103 +1678,103 @@ def test_params_as_strings(self):
f = OrderingFilter(
params=['username'],
)
self.assertEqual(f._params, OrderedDict((('username', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('username', {'exprs': [F('username')]}),)))

def test_params_as_list_of_tuples_with_string(self):
f = OrderingFilter(
params=[('user', 'username')]
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_list_of_tuples_with_strings(self):
f = OrderingFilter(
params=[('user', ('username',))]
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_list_of_tuples_with_expression(self):
f = OrderingFilter(
params=[('user', F('username'))]
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_list_of_tuples_with_expressions(self):
f = OrderingFilter(
params=[('user', (F('username'),))]
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_list_of_tuples_with_descriptor_and_string(self):
f = OrderingFilter(
params=[('user', {'expr': 'username'})]
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_list_of_tuples_with_descriptor_and_expression(self):
f = OrderingFilter(
params=[('user', {'expr': F('username')})]
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_list_of_tuples_with_descriptor_and_strings(self):
f = OrderingFilter(
params=[('user', {'exprs': ('username',)})]
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_list_of_tuples_with_descriptor_and_expressions(self):
f = OrderingFilter(
params=[('user', {'exprs': (F('username'),)})]
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_dict_with_string(self):
f = OrderingFilter(
params={'user': 'username'}
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_dict_with_strings(self):
f = OrderingFilter(
params={'user': ('username',)}
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_dict_with_expression(self):
f = OrderingFilter(
params={'user': F('username')}
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_dict_with_expressions(self):
f = OrderingFilter(
params={'user': (F('username'),)}
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_dict_with_descriptor_and_string(self):
f = OrderingFilter(
params={'user': {'expr': 'username'}}
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_dict_with_descriptor_and_expression(self):
f = OrderingFilter(
params={'user': {'expr': F('username')}}
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_dict_with_descriptor_and_strings(self):
f = OrderingFilter(
params={'user': {'exprs': ('username',)}}
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_params_as_dict_with_descriptor_and_expressions(self):
f = OrderingFilter(
params={'user': {'exprs': (F('username'),)}}
)
self.assertEqual(f._params, OrderedDict((('user', {'exprs': [F('username')]}),)))
self.assertEqual(f.params, OrderedDict((('user', {'exprs': [F('username')]}),)))

def test_choices_unaltered_with_params(self):
# provided 'choices' should not be altered when 'params' is present
Expand Down

0 comments on commit edda682

Please sign in to comment.