SVN: r23602 - trunk/quixote/form2

Author: nascheme
Date: 2004-03-01 11:07:49 -0500 (Mon, 01 Mar 2004)
New Revision: 23602

Modified:
   trunk/quixote/form2/form.py
Log:
Rename 'klass' to 'component_class' and 'widget_class'.


Modified: trunk/quixote/form2/form.py
===================================================================
--- trunk/quixote/form2/form.py	2004-03-01 15:38:23 UTC (rev 23601)
+++ trunk/quixote/form2/form.py	2004-03-01 16:07:49 UTC (rev 23602)
@@ -364,18 +364,19 @@
             raise ValueError, "form already has '%s' variable" % name
         self._names[name] = obj
 
-    def add_component(self, klass, name, *args, **kwargs):
+    def add_component(self, component_class, name, *args, **kwargs):
         """(FormComponent, name : string, ...)
 
         Add a form component object to the form.
         """
-        if not issubclass(klass, FormComponent):
-            raise TypeError, 'FormComponent subclass required (got %r)' % klass
-        component = klass(name, *args, **kwargs)
+        if not issubclass(component_class, FormComponent):
+            raise TypeError('FormComponent subclass required (got %r)' %
+                            component_class)
+        component = component_class(name, *args, **kwargs)
         self._add_name(name, component)
         self.components.append(component)
 
-    def add(self, klass, name, value=None,
+    def add(self, widget_class, name, value=None,
              title=None, hint=None, required=False, **kwargs):
         """(Widget,
             name : string,
@@ -389,9 +390,9 @@
         'value' also depends on the widget class.  Any extra keyword args are
         passed to the constructor method.
         """
-        if issubclass(klass, HiddenWidget):
+        if issubclass(widget_class, HiddenWidget):
             raise TypeError, "use add_hidden() to add hidden widgets"
-        self.add_component(self.component_class, name, klass, value,
+        self.add_component(self.component_class, name, widget_class, value,
                            title, hint, required, **kwargs)