Changeset 5764

Timestamp:

11/24/08 12:58:26 (2 months ago)

Author:

chrisz

Message:

Fixed two minor problems with WidgetLists? (#2014):
1. Fields added to declared fields now come last.
2. Subclasses now inherit fields from base class.

Files:

• branches/1.1/turbogears/widgets/base.py (modified) (2 diffs)
• branches/1.1/turbogears/widgets/tests/test_widgets.py (modified) (1 diff)
• branches/1.5/turbogears/widgets/base.py (modified) (2 diffs)
• branches/1.5/turbogears/widgets/tests/test_widgets.py (modified) (1 diff)

branches/1.1/turbogears/widgets/base.py

@@ -461 +461 @@
-    def __new__(meta, class_name, bases, class_dict):
-        declared_widgets = []
+        for base in bases:
+            declared_widgets.extend(getattr(base, 'declared_widgets', []))
-        for name, value in class_dict.items():
-            if isinstance(value, Widget):
@@ -483 +485 @@
-
-    def __init__(self, *args):
+        super(WidgetsList, self).__init__(self.declared_widgets)
-        if args:
-
-
-
-
-
-
+
+
+
+
+
-        if not self:
-            warnings.warn("You have declared an empty WidgetsList")

branches/1.1/turbogears/widgets/tests/test_widgets.py

@@ -187 +187 @@
-    assert widgetlist[0] == w
-    assert widgetlist[1] == w2
+    w3, w4 = widgets.Widget(), widgets.Widget()
+    widgetlist = W([w3, w4])
+    assert len(widgetlist) == 4
+    assert widgetlist[0] == w
+    assert widgetlist[1] == w2
+    assert widgetlist[2] == w3
+    assert widgetlist[3] == w4
+
+def test_widgetslist_inheritance():
+    """Widget lists can inherit fields."""
+    w = widgets.Widget(name="foo")
+    class W(widgets.WidgetsList):
+        foo = w
+    w2 = widgets.Widget(name="bar")
+    class W2(W):
+        bar = w2
+    widgetlist = W2()
+    assert len(widgetlist) == 2
+    assert widgetlist[0] == w
+    assert widgetlist[1] == w2
+    w3, w4 = widgets.Widget(), widgets.Widget()
+    widgetlist = W2([w3, w4])
+    assert len(widgetlist) == 4
+    assert widgetlist[0] == w
+    assert widgetlist[1] == w2
+    assert widgetlist[2] == w3
+    assert widgetlist[3] == w4
-
-def test_widget_url():

branches/1.5/turbogears/widgets/base.py

@@ -461 +461 @@
-    def __new__(meta, class_name, bases, class_dict):
-        declared_widgets = []
+        for base in bases:
+            declared_widgets.extend(getattr(base, 'declared_widgets', []))
-        for name, value in class_dict.items():
-            if isinstance(value, Widget):
@@ -483 +485 @@
-
-    def __init__(self, *args):
+        super(WidgetsList, self).__init__(self.declared_widgets)
-        if args:
-
-
-
-
-
-
+
+
+
+
+
-        if not self:
-            warnings.warn("You have declared an empty WidgetsList")

branches/1.5/turbogears/widgets/tests/test_widgets.py

@@ -187 +187 @@
-    assert widgetlist[0] == w
-    assert widgetlist[1] == w2
+    w3, w4 = widgets.Widget(), widgets.Widget()
+    widgetlist = W([w3, w4])
+    assert len(widgetlist) == 4
+    assert widgetlist[0] == w
+    assert widgetlist[1] == w2
+    assert widgetlist[2] == w3
+    assert widgetlist[3] == w4
+
+def test_widgetslist_inheritance():
+    """Widget lists can inherit fields."""
+    w = widgets.Widget(name="foo")
+    class W(widgets.WidgetsList):
+        foo = w
+    w2 = widgets.Widget(name="bar")
+    class W2(W):
+        bar = w2
+    widgetlist = W2()
+    assert len(widgetlist) == 2
+    assert widgetlist[0] == w
+    assert widgetlist[1] == w2
+    w3, w4 = widgets.Widget(), widgets.Widget()
+    widgetlist = W2([w3, w4])
+    assert len(widgetlist) == 4
+    assert widgetlist[0] == w
+    assert widgetlist[1] == w2
+    assert widgetlist[2] == w3
+    assert widgetlist[3] == w4
-
-def test_widget_url():