Normalize whitespace. (quixote/form: form.ptl, widget.py)
Greg Ward <gward-fVcApmY9cLvQ3/1i3zOLAti2O/[email protected]> Wed, 20 Nov 2002 14:43:24 -0500
| Newsgroups | gmane.comp.web.quixote.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /home/cvs/quixote/form
In directory hewson:/tmp/cvs-serv18744/form
Modified Files:
form.ptl widget.py
Log Message:
Normalize whitespace.
Index: form.ptl
===================================================================
RCS file: /home/cvs/quixote/form/form.ptl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- form.ptl 20 Nov 2002 19:39:55 -0000 1.7
+++ form.ptl 20 Nov 2002 19:43:22 -0000 1.8
@@ -292,9 +292,9 @@
method.
"""
raise NotImplementedError, "sub-classes must implement 'action()'"
-
+
def handle (self, request):
- """handle(request : HTTPRequest) -> string
+ """handle(request : HTTPRequest) -> string
Master method for handling forms. It should be called after
initializing a form. Controls form action based on a request. You
@@ -310,7 +310,7 @@
values = self.process(request)
if submit == "":
# The form was submitted by unknown submit button, assume that
- # the submission was required to update the layout of the form.
+ # the submission was required to update the layout of the form.
# Clear the errors and re-render the form.
self.error.clear()
return self.render(request, action_url)
@@ -334,13 +334,13 @@
return self.render(request, action_url)
else:
return self.action(request, submit, values)
-
+
# -- Convenience methods -------------------------------------------
def form_submitted (self, request):
"""form_submitted(request : HTTPRequest) -> boolean
-
+
Return true if a form was submitted in the current request.
"""
return len(request.form) > 0
@@ -351,7 +351,7 @@
if query:
action_url += "?" + query
return action_url
-
+
def get_submit_button (self, request):
"""get_submit_button(request : HTTPRequest) -> string | None
@@ -426,7 +426,7 @@
elif mode == "direct":
if not hasattr(target, key):
raise AttributeError, \
- ("target object %s doesn't have attribute %s" %
+ ("target object %s doesn't have attribute %s" %
(`target`, key))
setattr(target, key, value)
elif mode == "dict":
Index: widget.py
===================================================================
RCS file: /home/cvs/quixote/form/widget.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- widget.py 18 Nov 2002 22:21:58 -0000 1.44
+++ widget.py 20 Nov 2002 19:43:22 -0000 1.45
@@ -110,7 +110,7 @@
# password PasswordWidget
# radio RadiobuttonWidget
# checkbox CheckboxWidget
-#
+#
# and also to the other basic form elements:
# <textarea> TextWidget
# <select> SingleSelectWidget
@@ -319,10 +319,10 @@
raise ValueError, "duplicated descriptions (provide keys)"
used_keys[key] = 1
return keys
-
+
def set_options (self, options, sort=0):
"""(options: [objects:any], sort=0)
- or
+ or
(options: [(object:any, description:any)], sort=0)
or
(options: [(object:any, description:any, key:any)], sort=0)
@@ -330,7 +330,7 @@
"""
Set the options list. The list of options can be a list of objects, in
- which case the descriptions default to map(htmlescape, objects)
+ which case the descriptions default to map(htmlescape, objects)
applying htmlescape() to each description and
key.
If keys are provided they must be distinct. If the sort keyword
@@ -492,7 +492,7 @@
for multipe selects, the value is None or a list of
elements from dict(self.options).values()
"""
-
+
widget_type = "multiple_select"
def set_value (self, value):
@@ -542,7 +542,7 @@
value = (self.value and htmlescape(self.value) or None)
return htmltag("input", xml_end=1, type="submit",
name=self.name, value=value)
-
+
def parse (self, request):
return request.form.get(self.name)
@@ -596,7 +596,7 @@
type_object = None # eg. int, float
type_error = None # human-readable error message
type_converter = None # eg. int(), float()
-
+
def __init__ (self, name,
value=None,
size=None, maxlength=None):
@@ -696,7 +696,7 @@
assert type(element_name) in (StringType, htmltext), (
"form value '%s' element_name not a string: "
"got %r" % (name, element_name))
-
+
Widget.__init__(self, name, value)
if element_type is None:
@@ -711,7 +711,7 @@
self.add_button = self.create_subwidget(
"submit_button", "add_element",
value="Add %s" % element_name)
-
+
self.element_widgets = []
self.element_count = 0
@@ -742,7 +742,7 @@
tags.append(self.add_button.render(request))
tags.append(self.added_elements_widget.render(request))
return htmltext('<br />\n').join(tags)
-
+
def parse (self, request):
if self.add_button.parse(request):