From f858b51ee31314225e82812f58f353721f06101a Mon Sep 17 00:00:00 2001 From: Josh Smeaton Date: Tue, 27 Jan 2015 13:42:48 +1100 Subject: [PATCH] [1.8.x] Refs #14030 -- Renamed CombinableMixin to Combinable Removed unused method and updated docstrings. Backport of 14d0bd67d4bcf55f8a0a2b01433571a8b714121f from master --- django/db/models/expressions.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 9caa5dace43..87a08ecc3ba 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -11,7 +11,7 @@ from django.utils import timezone from django.utils.functional import cached_property -class CombinableMixin(object): +class Combinable(object): """ Provides the ability to combine one or two objects with some connector. For example F('foo') + F('bar'). @@ -184,6 +184,7 @@ class BaseExpression(object): in this query * reuse: a set of reusable joins for multijoins * summarize: a terminal aggregate clause + * for_save: whether this expression about to be used in a save or update Returns: an ExpressionNode to be added to the query. """ @@ -297,9 +298,6 @@ class BaseExpression(object): return agg, lookup return False, () - def prepare_database_save(self, field): - return self - def get_group_by_cols(self): if not self.contains_aggregate: return [self] @@ -325,7 +323,7 @@ class BaseExpression(object): return self -class ExpressionNode(BaseExpression, CombinableMixin): +class ExpressionNode(BaseExpression, Combinable): """ An expression that can be combined with other expressions. """