Merge pull request #70 from mshriver/support-versionpick-cls-attrs

[RFR] Update Widget.cls_widget_names, check values

src/widgetastic/widget.py

@@ -373,7 +373,9 @@ def cls_widget_names(cls):
         for key in dir(cls):
             value = getattr(cls, key)
             if isinstance(value, Widgetable):
-                result.append((key, value))
+                # check the values of a VersionPick object are widgetable themselves
+                if all([isinstance(item, Widgetable) for item in value.child_items]):
+                    result.append((key, value))
         for includer in cls._included_widgets:
             result.append((None, includer))
         presorted_widgets = sorted(result, key=lambda pair: pair[1]._seq_id)

testing/test_version_pick.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+from six import string_types
 
 import pytest
 
@@ -73,10 +74,17 @@ class MyView(View):
             Version.lowest(): Checkbox(id='nonexisting'),
             '1.0.0': TextInput(name='input1')
         })
+        view_attr = VersionPick({
+            Version.lowest(): 'lowest_attr',
+            '1.0.0': 'version_1_attr'
+        })
 
     view = MyView(browser)
     assert 'widget' in view.widget_names
+    assert 'view_attr' not in view.widget_names
     assert isinstance(view.widget, TextInput)
+    assert isinstance(view.view_attr, string_types)
+    assert view.view_attr == 'version_1_attr'
     assert view.widget.fill('test text')
     assert view.widget.read() == 'test text'