summaryrefslogtreecommitdiff
path: root/django/db/models/expressions.py
diff options
context:
space:
mode:
authorDaniel Miller <dmiller@dimagi.com>2018-04-16 09:10:13 -0400
committerTim Graham <timograham@gmail.com>2018-04-16 10:15:13 -0400
commit60156750f66fe9e8b95067654b292f12a055393c (patch)
tree496b3c7790953257038159603a2aa24307216ed1 /django/db/models/expressions.py
parent1d5d4867f4870722b0188c71b4920aa58c8a047d (diff)
downloaddjango-60156750f66fe9e8b95067654b292f12a055393c.tar.gz
Fixed #29330 -- Fixed crash when pickling BaseExpression.
Regression in cfff2af02be40106d4759cc6f8bfa476ce82421c.
Diffstat (limited to 'django/db/models/expressions.py')
-rw-r--r--django/db/models/expressions.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index 44c687ffa7..219485750f 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -153,6 +153,11 @@ class BaseExpression:
if output_field is not None:
self.output_field = output_field
+ def __getstate__(self):
+ state = self.__dict__.copy()
+ state.pop('convert_value', None)
+ return state
+
def get_db_converters(self, connection):
return (
[]