Move AutoWidget stuff into factory.py

toscawidgets · Jul 19, 2012 · d1397dc · d1397dc
1 parent 2bfe07d
commit d1397dc
Show file tree

Hide file tree

Showing 4 changed files with 390 additions and 383 deletions.
diff --git a/tests/test_widgets.py b/tests/test_widgets.py
@@ -958,7 +958,7 @@ def setup(self):
 
     declarative = True
     def test_exception_manytoone(self):
-        class WackPolicy(tws.widgets.WidgetPolicy):
+        class WackPolicy(tws.WidgetPolicy):
             pass
         props = filter(
             lambda x : x.key == 'other',
@@ -972,7 +972,7 @@ class WackPolicy(tws.widgets.WidgetPolicy):
                    "for many-to-one relation 'other'")
 
     def test_exception_onetomany(self):
-        class WackPolicy(tws.widgets.WidgetPolicy):
+        class WackPolicy(tws.WidgetPolicy):
             pass
         props = filter(
             lambda x : x.key == 'others',
@@ -986,7 +986,7 @@ class WackPolicy(tws.widgets.WidgetPolicy):
                    "for one-to-many relation 'others'")
 
     def test_exception_onetoone(self):
-        class WackPolicy(tws.widgets.WidgetPolicy):
+        class WackPolicy(tws.WidgetPolicy):
             pass
         props = filter(
             lambda x : x.key == 'account',
@@ -1000,7 +1000,7 @@ class WackPolicy(tws.widgets.WidgetPolicy):
                    "for one-to-one relation 'account'")
 
     def test_exception_default(self):
-        class WackPolicy(tws.widgets.WidgetPolicy):
+        class WackPolicy(tws.WidgetPolicy):
             pass
         props = filter(
             lambda x : x.key == 'name',
@@ -1013,7 +1013,7 @@ class WackPolicy(tws.widgets.WidgetPolicy):
             assert(str(e) == "Cannot automatically create a widget for 'name'")
 
     def test_name_widgets(self):
-        class AwesomePolicy(tws.widgets.WidgetPolicy):
+        class AwesomePolicy(tws.WidgetPolicy):
             name_widgets = { 'name' : twf.LabelField, }
 
         props = filter(
@@ -1026,7 +1026,7 @@ class AwesomePolicy(tws.widgets.WidgetPolicy):
             assert(False)
 
     def test_info_on_prop(self):
-        class AwesomePolicy(tws.widgets.WidgetPolicy):
+        class AwesomePolicy(tws.WidgetPolicy):
             name_widgets = { 'name' : twf.LabelField, }
 
         props = filter(
@@ -1045,7 +1045,7 @@ class SomeListPage(tws.DbListPage):
             _no_autoid = True
             entity = self.DbTestCls1
 
-            class child(tws.widgets.AutoViewGrid):
+            class child(tws.AutoViewGrid):
                 name = twf.InputField(type='text')
 
         environ = {

diff --git a/tw2/sqla/__init__.py b/tw2/sqla/__init__.py
@@ -1,10 +1,13 @@
 from widgets import (
-    RelatedValidator, DbFormPage, DbListForm, DbLinkField, commit_veto, transactional_session,
-    DbSelectionField, DbSingleSelectField,
-    DbCheckBoxList, DbRadioButtonList, DbCheckBoxTable,
-    DbListPage, AutoTableForm, AutoViewGrid, AutoGrowingGrid,
+    RelatedValidator, DbFormPage, DbListForm, DbListPage, DbLinkField, 
+    commit_veto, transactional_session,
+    DbSelectionField, DbSingleSelectField, DbCheckBoxList, DbRadioButtonList, DbCheckBoxTable)
+from factory import (
+    WidgetPolicy, ViewPolicy, EditPolicy,
+    AutoTableForm, AutoViewGrid, AutoGrowingGrid,
     AutoListPage, AutoListPageEdit,
     AutoEditFieldSet, AutoViewFieldSet,
     NoWidget)
+
 import utils
 import widgets