similar optimization for Table class

Author: Bartek Ogryczak

pymysqlreplication/column.py

@@ -83,8 +83,8 @@ def __ne__(self, other):
         return not self.__eq__(other)
 
     def serializable_data(self):
-        return dict((k, v) for (k, v) in self.__dict__.items() if not k.startswith('_'))
+        return self.data
 
     @property
     def data(self):
-        return self.serializable_data()
+        return dict((k, v) for (k, v) in self.__dict__.items() if not k.startswith('_'))

pymysqlreplication/table.py

@@ -2,7 +2,7 @@
 
 
 class Table(object):
-    def __init__(self, column_schemas, table_id, schema, table, columns, primary_key = None):
+    def __init__(self, column_schemas, table_id, schema, table, columns, primary_key=None):
         if primary_key is None:
             primary_key = [c.data["name"] for c in columns if c.data["is_primary"]]
             if len(primary_key) == 0:
@@ -12,26 +12,24 @@ def __init__(self, column_schemas, table_id, schema, table, columns, primary_key
             else:
                 primary_key = tuple(primary_key)
 
-        self.data = {
+        self.__dict__.update({
             "column_schemas": column_schemas,
             "table_id": table_id,
             "schema": schema,
             "table": table,
             "columns": columns,
             "primary_key": primary_key
-        }
+        })
 
-    def __getattr__(self, item):
-        try:
-            return self.data[item]
-        except KeyError:
-            raise AttributeError
+    @property
+    def data(self):
+        return dict((k, v) for (k, v) in self.__dict__.items() if not k.startswith('_'))
 
     def __eq__(self, other):
         return self.data == other.data
 
     def __ne__(self, other):
-        return self.__eq__(other)
+        return not self.__eq__(other)
 
     def serializable_data(self):
         return self.data