Remove deprecated TableMetadata.keyspace attribute

aholmberg · aholmberg · commit cc9407366abd · 2015-10-06T12:05:16.000-05:00
diff --git a/cassandra/metadata.py b/cassandra/metadata.py
@@ -185,7 +185,6 @@ def _update_table(self, meta):
             # return one or the other based on the query results.
             # Here we deal with that.
             if isinstance(meta, TableMetadata):
-                meta.keyspace = keyspace_meta  # temporary while TableMetadata.keyspace is deprecated
                 keyspace_meta._add_table_metadata(meta)
             else:
                 keyspace_meta._add_view_metadata(meta)
@@ -952,14 +951,6 @@ class TableMetadata(object):
     A representation of the schema for a single table.
     """
 
-    keyspace = None
-    """
-    An instance of :class:`~.KeyspaceMetadata`.
-
-    .. deprecated:: 2.7.0
-
-    """
-
     keyspace_name = None
     """ String name of this Table's keyspace """
 
@@ -1348,13 +1339,13 @@ def as_cql_query(self):
 
             return "CREATE INDEX %s ON %s.%s (%s)" % (
                 self.name,  # Cassandra doesn't like quoted index names for some reason
-                protect_name(table.keyspace.name),
+                protect_name(table.keyspace_name),
                 protect_name(table.name),
                 index_target)
         else:
             return "CREATE CUSTOM INDEX %s ON %s.%s (%s) USING '%s'" % (
                 self.name,  # Cassandra doesn't like quoted index names for some reason
-                protect_name(table.keyspace.name),
+                protect_name(table.keyspace_name),
                 protect_name(table.name),
                 protect_name(self.column.name),
                 self.index_options["class_name"])
@@ -1556,7 +1547,7 @@ def __init__(self, table_metadata, trigger_name, options=None):
     def as_cql_query(self):
         ret = "CREATE TRIGGER %s ON %s.%s USING %s" % (
             protect_name(self.name),
-            protect_name(self.table.keyspace.name),
+            protect_name(self.table.keyspace_name),
             protect_name(self.table.name),
             protect_value(self.options['class'])
         )
@@ -1644,7 +1635,6 @@ def get_all_keyspaces(self):
             try:
                 for table_row in self.keyspace_table_rows.get(keyspace_meta.name, []):
                     table_meta = self._build_table_metadata(table_row)
-                    table_meta.keyspace = keyspace_meta  # temporary while TableMetadata.keyspace is deprecated
                     keyspace_meta._add_table_metadata(table_meta)
 
                 for usertype_row in self.keyspace_type_rows.get(keyspace_meta.name, []):
diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py
@@ -126,7 +126,7 @@ def test_basic_table_meta_properties(self):
 
         self.assertTrue(self.cfname in ksmeta.tables)
         tablemeta = ksmeta.tables[self.cfname]
-        self.assertEqual(tablemeta.keyspace, ksmeta)  # tablemeta.keyspace is deprecated
+        self.assertEqual(tablemeta.keyspace_name, ksmeta.name)
         self.assertEqual(tablemeta.name, self.cfname)
 
         self.assertEqual([u'a'], [c.name for c in tablemeta.partition_key])
