From bd43d001c4b42beafce6861d355a381852bf4432 Mon Sep 17 00:00:00 2001 From: Paul Makepeace Date: Thu, 23 Jun 2011 09:49:25 +0000 Subject: [PATCH] Clean up interface to passing multiple facets into Engine() --- google/refine/facet.py | 12 ++++-------- tests/test_facet.py | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/google/refine/facet.py b/google/refine/facet.py index ffa8c65..2c5f254 100644 --- a/google/refine/facet.py +++ b/google/refine/facet.py @@ -208,17 +208,13 @@ class Engine(object): facets = [] facet_index_by_id = {} # dict of facets by Facet object id - def __init__(self, facets=None, mode='row-based'): - self.set_facets(facets) - self.mode = mode + def __init__(self, *facets, **kwargs): + self.set_facets(*facets) + self.mode = kwargs.get('mode', 'row-based') - def set_facets(self, facets=None): + def set_facets(self, *facets): """facets may be a Facet or list of Facets.""" self.remove_all() - if facets is None: - facets = [] - elif not isinstance(facets, list): - facets = [facets] for facet in facets: self.add_facet(facet) diff --git a/tests/test_facet.py b/tests/test_facet.py index 9604f5e..32746b7 100644 --- a/tests/test_facet.py +++ b/tests/test_facet.py @@ -74,7 +74,7 @@ class EngineTest(unittest.TestCase): self.assertEqual(engine.mode, 'record-based') engine.set_facets(BlankFacet) self.assertEqual(engine.mode, 'record-based') - engine.set_facets([BlankFacet] * 2) + engine.set_facets(BlankFacet, BlankFacet) self.assertEqual(len(engine), 2) def test_serialize(self): @@ -98,7 +98,7 @@ class EngineTest(unittest.TestCase): text_facet1.include('element') text_facet2 = TextFacet('column name 2') text_facet2.include('element 2') - engine = Engine([text_facet1, text_facet2]) + engine = Engine(text_facet1, text_facet2) self.assertEqual(len(engine), 2) self.assertEqual(len(text_facet1.selection), 1) engine.reset_all()