api improvements

mainline/core/api.py

@@ -534,7 +534,7 @@ class Plugin(BasePlugin):
                 # mark the plug-in as updated in order to trigger full rescan
                 self.is_updated = self.is_updated or is_created
 
-class MetricPlugin(Plugin):
+class SimpleMetricMixin(object):
     
     def declare_metric(self, is_active, field,
                        pattern_to_search_or_map_of_patterns,

mainline/ext/std/code/complexity.py

@@ -21,7 +21,7 @@ import core.api
 
 import re
 
-class Plugin(core.api.MetricPlugin, core.api.Child, core.api.IConfigurable):
+class Plugin(core.api.Plugin, core.api.SimpleMetricMixin, core.api.Child, core.api.IConfigurable):
     
     def declare_configuration(self, parser):
         parser.add_option("--std.code.complexity.cyclomatic", "--sccc", action="store_true", default=False,

mainline/ext/std/code/lines.py

@@ -20,7 +20,7 @@
 import core.api
 import re
 
-class Plugin(core.api.MetricPlugin, core.api.Child, core.api.IConfigurable):
+class Plugin(core.api.Plugin, core.api.SimpleMetricMixin, core.api.Child, core.api.IConfigurable):
     
     def declare_configuration(self, parser):
         parser.add_option("--std.code.lines.code", "--sclc", action="store_true", default=False,