mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-09 05:18:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #32450 -- Fixed crash when ANDing/ORing an empty Q() with not pickleable Q().

Browse source 
Regression in bb0b6e5263.
This commit is contained in:
starryrbs 2021-02-18 00:04:59 +08:00 • committed by Mariusz Felisiak
parent 1710cdbe79
commit 466920f6d7
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
django/db/models/query_utils.py
View file

@ -5,7 +5,6 @@ Factored out from django.db.models.query to avoid making the main module very
large and/or so that they can be used by other modules without getting into
circular import difficulties.
"""
import copy
import functools
import inspect
from collections import namedtuple
@ -46,10 +45,12 @@ class Q(tree.Node):
# If the other Q() is empty, ignore it and just use `self`.
if not other:
return copy.deepcopy(self)
_, args, kwargs = self.deconstruct()
return type(self)(*args, **kwargs)
# Or if this Q is empty, ignore it and just use `other`.
elif not self:
return copy.deepcopy(other)
_, args, kwargs = other.deconstruct()
return type(other)(*args, **kwargs)
obj = type(self)()
obj.connector = conn