[1.8.x] Refs #14030 -- Renamed CombinableMixin to Combinable

jarshwah · jarshwah · commit f858b51ee313 · 2015-01-28T11:04:12.000+11:00
Removed unused method and updated docstrings. Backport of 14d0bd6 from master
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
@@ -11,7 +11,7 @@
 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 @@ def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize
            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 @@ def refs_aggregate(self, existing_aggregates):
                 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 @@ def reverse_ordering(self):
         return self
 
 
-class ExpressionNode(BaseExpression, CombinableMixin):
+class ExpressionNode(BaseExpression, Combinable):
     """
     An expression that can be combined with other expressions.
     """
