Ticket #2447: fix_and_test_cases.diff

turbogears/widgets/base.py

@@ -477 +477 @@
                 if not value.is_named:
                     value.name = name
                 declared_widgets.append(value)
-                del class_dict[name]
         declared_widgets.sort(key=lambda w: w._declaration_counter)
         cls = type.__new__(meta, class_name, bases, class_dict)
         cls.declared_widgets = declared_widgets

turbogears/widgets/tests/test_widgets.py

@@ -239 +239 @@
     assert widgetlist[2] == w3
     assert widgetlist[3] == w4
 
+def test_declared_widgets_in_widgetslist_accessable():
+    class W1(widgets.WidgetsList):
+        foo = widgets.Widget()
+    w1 = W1()
+    assert hasattr(w1, 'foo')
+
+    class W2(W1):
+        bar = widgets.Widget()
+    w2 = W2()
+    assert hasattr(w2, 'foo')
+    assert hasattr(w2, 'bar')
+
+    class W3(widgets.WidgetsList):
+        pass
+    w3 = W3(widgets.Widget(name='foo'))
+    assert not hasattr(w3, 'foo'), 'Only declared widgets must be accessable by name'
+
 def test_widget_url():
     """It might be needed to insert an URL somewhere"""
     url = widgets.URLLink(link='http://www.turbogears.org')