Skip to content
This repository has been archived by the owner on Mar 24, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
rossjones committed Mar 12, 2018
2 parents 1d072be + 1d5580a commit ca379bc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions backdrop/read/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from backdrop.core.query import Query
import re


__all__ = ['parse_query_from_request']


Expand Down Expand Up @@ -67,7 +66,8 @@ def parse_filter_by(filter_by, is_regex):
if ':' in collect_arg:
args['collect'].append(tuple(collect_arg.split(':')))
else:
args['collect'].append((collect_arg, 'default'))
args['collect'].append(
(collect_arg, 'default'))

args['flatten'] = if_present(boolify, request_args.get('flatten'))
args['inclusive'] = if_present(boolify, request_args.get('inclusive'))
Expand Down

0 comments on commit ca379bc

Please sign in to comment.