diff options
author | René Stadler <mail@renestadler.de> | 2009-02-05 01:09:37 +0200 |
---|---|---|
committer | René Stadler <mail@renestadler.de> | 2009-02-07 23:07:56 +0200 |
commit | 8ae5460f2f1422a2090635b12ee657ecce0238df (patch) | |
tree | c2fd2b79808caf846aced906229cfd0227be4785 | |
parent | 5da1b841903c76364b0a65e0035fcf312d44f134 (diff) |
Replace sets.Set usage with built-in set class
-rw-r--r-- | GstInspector/Data.py | 8 | ||||
-rw-r--r-- | GstInspector/GUI/app.py | 4 | ||||
-rw-r--r-- | GstInspector/GUI/filters.py | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/GstInspector/Data.py b/GstInspector/Data.py index 37316bc..fc69e08 100644 --- a/GstInspector/Data.py +++ b/GstInspector/Data.py @@ -1750,8 +1750,6 @@ class Collector (Consumer): def __init__ (self, accessor_spec, chain_level = None): - from sets import Set - plugin_accessor_spec = accessor_transform (accessor_spec, "plugin") if chain_level is None: @@ -1759,7 +1757,7 @@ class Collector (Consumer): self.accessor = accessor (plugin_accessor_spec) self.chain_level = chain_level - self.items = Set () + self.items = set () def clear (self): @@ -1775,12 +1773,12 @@ class Collector (Consumer): if self.chain_level == 0: self.items.add (item) elif self.chain_level == 1: - self.items.union_update (item) + self.items.update (item) else: item = tuple (item) for n in range (self.chain_level - 1): item = tuple (chain (*item)) - self.items.union_update (item) + self.items.update (item) class Filter (object): diff --git a/GstInspector/GUI/app.py b/GstInspector/GUI/app.py index 39e6c6b..227712e 100644 --- a/GstInspector/GUI/app.py +++ b/GstInspector/GUI/app.py @@ -37,8 +37,6 @@ class InspectorApp (Data.Consumer): def __init__ (self): - from sets import Set - self.logger = logging.getLogger ("app") self.windows = [] @@ -46,7 +44,7 @@ class InspectorApp (Data.Consumer): self.element_model = ElementModel () ui_filter_classes = FilterManager.iter_item_classes () - model_factories = Set ((cls.get_model_factory () + model_factories = set ((cls.get_model_factory () for cls in ui_filter_classes)) if None in model_factories: model_factories.remove (None) diff --git a/GstInspector/GUI/filters.py b/GstInspector/GUI/filters.py index 76b8a6f..b1d7927 100644 --- a/GstInspector/GUI/filters.py +++ b/GstInspector/GUI/filters.py @@ -136,14 +136,12 @@ class FilterModelFactoryCapsNames (FilterModelFactory): def fill (self): - from sets import Set - model = self.model items = self.collector.items raw_names = [n for n in items if "-raw-" in n] non_raw_names = [n for n in items if not "-raw-" in n] - prefixes = Set ((name.split ("/")[0] for name in non_raw_names)) + prefixes = set ((name.split ("/")[0] for name in non_raw_names)) for name in sorted (raw_names): model.set (model.append (None), 0, name) |