Remove Model.__default_ttl__

aboudreault · aboudreault · commit e1b11b09403d · 2017-12-29T11:06:53.000-05:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,10 +14,11 @@ Bug Fixes
 Other
 -----
 * Cassandra 2.0 support removal (PYTHON-716)
-* cqlengine: disallow Counter create, save operations (PYTHON-497)
-* cqlengine: remove the negative indices slicing support in ModelQuerySet (PYTHON-875)
 * PreparedStatement.column_metadata should be renamed to bind_metadata (PYTHON-884)
 * Remove Cluster.set_meta_refresh_enabled (PYTHON-890)
+* cqlengine: disallow Counter create, save operations (PYTHON-497)
+* cqlengine: remove the negative indices slicing support in ModelQuerySet (PYTHON-875)
+* cqlengine: Remove Model.__default_ttl__ (PYTHON-889)
 
 3.12.0
 ======
diff --git a/cassandra/cqlengine/models.py b/cassandra/cqlengine/models.py
@@ -35,7 +35,6 @@ def _clone_model_class(model, attrs):
     try:
         new_type.__abstract__ = model.__abstract__
         new_type.__discriminator_value__ = model.__discriminator_value__
-        new_type.__default_ttl__ = model.__default_ttl__
     except AttributeError:
         pass
     return new_type
@@ -933,10 +932,6 @@ def __new__(cls, name, bases, attrs):
         # short circuit __discriminator_value__ inheritance
         attrs['__discriminator_value__'] = attrs.get('__discriminator_value__')
 
-        # TODO __default__ttl__ should be removed in the next major release
-        options = attrs.get('__options__') or {}
-        attrs['__default_ttl__'] = options.get('default_time_to_live')
-
         column_definitions = [(k, v) for k, v in attrs.items() if isinstance(v, columns.Column)]
         column_definitions = sorted(column_definitions, key=lambda x: x[1].position)
 
diff --git a/docs/api/cassandra/cqlengine/models.rst b/docs/api/cassandra/cqlengine/models.rst
@@ -34,11 +34,6 @@ Model
 
     .. autoattribute:: __connection__
 
-    .. attribute:: __default_ttl__
-        :annotation:  = None
-
-        Will be deprecated in release 4.0. You can set the default ttl by configuring the table ``__options__``. See :ref:`ttl-change` for more details.
-
     .. autoattribute:: __discriminator_value__
 
         See :ref:`model_inheritance` for usage examples.
diff --git a/docs/cqlengine/upgrade_guide.rst b/docs/cqlengine/upgrade_guide.rst
@@ -69,6 +69,8 @@ Upgrade Guide 3.x to 4.x
 
     Automobile.objects.all()[-10:]
 
+* Model.__default_ttl__ has been removed.
+
 Upgrade Guide cqlengine to cassandra.cqlengine
 ==============================================
 
