diff options
Diffstat (limited to 'django/db/models/query_utils.py')
| -rw-r--r-- | django/db/models/query_utils.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py index 6f1b860f21..0ce7900c74 100644 --- a/django/db/models/query_utils.py +++ b/django/db/models/query_utils.py @@ -28,10 +28,7 @@ class Q(tree.Node): default = AND def __init__(self, *args, **kwargs): - if args and kwargs: - raise TypeError('Use positional *or* kwargs; not both!') - nodes = list(args) + kwargs.items() - super(Q, self).__init__(children=nodes) + super(Q, self).__init__(children=list(args) + kwargs.items()) def _combine(self, other, conn): if not isinstance(other, Q): @@ -51,6 +48,3 @@ class Q(tree.Node): obj.negate() return obj -def not_q(q): - return ~q - |