fixes.__init__: move dynamic-related code to the correct subclass

my2to3/fixes/__init__.py

@@ -14,15 +14,27 @@ class BaseStaticTraceFix(BaseFix):
     super(BaseStaticTraceFix, self).__init__(*args, **kwargs)
 
     # Note: id is used to differentiate the divisions of the same line.
-    shared_columns = "filename", "lineno", "id"
-    self.insert_trace = create_table(self.basename + "_trace", *(shared_columns + self.traced_information))
-    self.insert_modified = create_table(self.basename + "_modified", *shared_columns)
+    self.insert_trace = create_table(self.basename + "_trace", "filename", "lineno", "id", *self.traced_information)
 
   def start_tree(self, *args, **kwargs):
     super(BaseStaticTraceFix, self).start_tree(*args, **kwargs)
 
     self.ids = defaultdict(int)
 
+
+class BaseDynamicTraceFix(BaseStaticTraceFix):
+  def __init__(self, *args, **kwargs):
+    super(BaseDynamicTraceFix, self).__init__(*args, **kwargs)
+
+    def f(filename, lineno, id_, *args, **kwargs):
+      result, values = self._dynamic_trace(*args, **kwargs)
+      self.insert_trace(filename, lineno, id_, *values)
+      return result
+    f.__name__ = self.basename + "_traced"
+    tracing_functions.append(f)
+
+    self.insert_modified = create_table(self.basename + "_modified", "filename", "lineno", "id")
+
   def traced_call(self, node, children):
     # Important: every node inside "children" should be cloned before this
     # function is called.
@@ -54,18 +66,6 @@ class BaseStaticTraceFix(BaseFix):
     return new_node
 
 
-class BaseDynamicTraceFix(BaseStaticTraceFix):
-  def __init__(self, *args, **kwargs):
-    super(BaseDynamicTraceFix, self).__init__(*args, **kwargs)
-
-    def f(filename, lineno, id_, *args, **kwargs):
-      result, values = self._dynamic_trace(*args, **kwargs)
-      self.insert_trace(filename, lineno, id_, *values)
-      return result
-    f.__name__ = self.basename + "_traced"
-    tracing_functions.append(f)
-
-
 class BaseSupportFix(BaseFix):
   def __init__(self, *args, **kwargs):
     super(BaseSupportFix, self).__init__(*args, **kwargs)