Basically switching some imports around

tw2/forms/__init__.py

@@ -2,7 +2,7 @@
 This package contains the basic form widgets.
 """
 
-from widgets import (Button, CheckBox, PostlabeledCheckBox,
+from widgets import (Button, CheckBox,
     FieldSet, FileField, Form, HiddenField, IgnoredField, ImageButton,
     Label, Spacer, ListLayout, TableLayout, PasswordField,
     RadioButton, ResetButton, SubmitButton, TextField, TextArea,
@@ -11,4 +11,5 @@
     VerticalRadioButtonTable, VerticalCheckBoxTable,
     TableFieldSet, ListFieldSet, FormPage, FileValidator,
     LabelField, LinkField)
+from mashups import PostlabeledCheckBox, PostlabeledPartialRadioButton
 from calendars import CalendarDatePicker, CalendarDateTimePicker

tw2/forms/calendars.py

@@ -35,10 +35,8 @@
 
 import formencode
 from formencode.validators import *
-from formencode.foreach import ForEach
 from formencode.compound import *
-from formencode.api import Invalid, NoDefault
-from formencode.schema import Schema
+from formencode.api import Invalid
 
 __all__ = ["CalendarDatePicker", "CalendarDateTimePicker", "calendar_js", "calendar_setup"]
 

tw2/forms/mashups.py

@@ -0,0 +1,13 @@
+import tw2.core as twc
+from widgets import CheckBox, PostlabeledInputField
+
+class PostlabeledCheckBox(CheckBox, PostlabeledInputField):
+    pass
+
+class PostlabeledPartialRadioButton(PostlabeledInputField):
+    """This is basically a manual mixin of RadioButton and IgnoredField. Inheritance doesn't work."""
+    type = "radio"
+    checked = twc.Param(attribute=True, default=False)
+
+    def _validate(self, value):
+        return twc.EmptyField

tw2/forms/widgets.py

@@ -1,4 +1,7 @@
-import tw2.core as twc, re, itertools, webob, cgi
+import tw2.core as twc
+import itertools
+import webob
+import cgi
 import math
 
 #--
@@ -40,9 +43,6 @@ def prepare(self):
         self.attrs['checked'] = self.value and 'checked' or None
         self.value = None
 
-class PostlabeledCheckBox(CheckBox, PostlabeledInputField):
-    pass
-
 class RadioButton(InputField):
     type = "radio"
     checked = twc.Param(attribute=True, default=False)