Changeset 1028
- Timestamp:
- 03/29/06 07:00:23
- Files:
-
- trunk/cherrypy/lib/defaultformmask.py (modified) (2 diffs)
- trunk/cherrypy/lib/form.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/lib/defaultformmask.py
r768 r1028 1 1 """Default mask for the form.py module""" 2 3 import warnings 4 warnings.warn("cherrypy.lib.defaultformmask is deprecated and might disappear in future versions of CherryPy", DeprecationWarning, stacklevel = 2) 2 5 3 6 from xml.sax.saxutils import quoteattr as q … … 60 63 vals = [field.currentValue] 61 64 i = '<input name=%s type="hidden" value=%%s />' % q(field.name) 62 return [i % q(v) for v in vals]65 return ''.join([i % q(v) for v in vals]) 63 66 elif field.typ in ('checkbox', 'radio'): 64 67 res.append('<td>') trunk/cherrypy/lib/form.py
r856 r1028 1 1 """Simple form handling module.""" 2 3 import warnings 4 warnings.warn("cherrypy.lib.form is deprecated and might disappear in future versions of CherryPy", DeprecationWarning, stacklevel = 2) 2 5 3 6 import cherrypy … … 7 10 class FormField: 8 11 9 def __init__(self, label, name, typ, mask=None, mandatory=0, size= 15,12 def __init__(self, label, name, typ, mask=None, mandatory=0, size='15', 10 13 optionList=[], defaultValue='', defaultMessage='', validate=None): 11 14 self.isField = 1 … … 52 55 method = "post" 53 56 enctype = "" 54 57 58 def __init__(self, action = "postForm", method = "post", enctype = "", header = defaultformmask.defaultHeader, footer = defaultformmask.defaultFooter, headerLabel = "", footerLabel = ""): 59 self.action = action 60 self.method = method 61 self.enctype = enctype 62 self.header = header 63 self.footer = footer 64 self.headerLabel = headerLabel 65 self.footerLabel = footerLabel 66 55 67 def formView(self, leaveValues=0): 56 68 if self.enctype: … … 59 71 enctypeTag = "" 60 72 61 res = ['<form method="%s" %s action="postForm">' 62 % (self.method, enctypeTag)] 73 res = ['<form method="%s" %s action="%s">' 74 % (self.method, enctypeTag, self.action)] 75 res.append(self.header(self.headerLabel)) 76 63 77 for field in self.fieldList: 64 78 res.append(field.render(leaveValues)) 65 res.append["</form>"] 79 80 res.append(self.footer(self.footerLabel)) 81 res.append("</form>") 66 82 67 83 return "".join(res)
