From aeb35548dc3a669aebec45f8f51a9cd3fbfc8801 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 12 Feb 2018 14:00:29 -0500 Subject: [2.0.x] Fixed #29125 -- Made Q.deconstruct() deterministic with multiple keyword arguments. Backport of b95c49c954e3b75678bb258e9fb2ec30d0d960bb from master --- django/db/models/query_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django') diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py index 8a889264e5..1ecc5e38c8 100644 --- a/django/db/models/query_utils.py +++ b/django/db/models/query_utils.py @@ -57,7 +57,7 @@ class Q(tree.Node): def __init__(self, *args, **kwargs): connector = kwargs.pop('_connector', None) negated = kwargs.pop('_negated', False) - super().__init__(children=list(args) + list(kwargs.items()), connector=connector, negated=negated) + super().__init__(children=list(args) + sorted(kwargs.items()), connector=connector, negated=negated) def _combine(self, other, conn): if not isinstance(other, Q): -- cgit v1.3