diff options
| author | Tim Graham <timograham@gmail.com> | 2018-02-12 14:00:29 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-02-12 20:47:51 -0500 |
| commit | aeb35548dc3a669aebec45f8f51a9cd3fbfc8801 (patch) | |
| tree | 7498078644b199f02bc4b6ee9759fea01a1053aa /django/db/models/query_utils.py | |
| parent | 0edcc723e728f57de0314e79b40502e9c787777d (diff) | |
[2.0.x] Fixed #29125 -- Made Q.deconstruct() deterministic with multiple keyword arguments.
Backport of b95c49c954e3b75678bb258e9fb2ec30d0d960bb from master
Diffstat (limited to 'django/db/models/query_utils.py')
| -rw-r--r-- | django/db/models/query_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): |