Mercurial > public > src > moin > extensions
changeset 618:e6a6740166c8
FormCreate: pep8 cleanup
| author | Thomas Waldmann <tw AT waldmann-edv DOT de> |
|---|---|
| date | Mon, 25 Mar 2013 16:34:37 +0100 |
| parents | 07e8932e3594 |
| children | d86bd9e634c1 |
| files | data/plugin/macro/FormBase.py data/plugin/macro/FormCheckbox.py data/plugin/macro/FormField.py data/plugin/macro/FormFooter.py data/plugin/macro/FormHeader.py data/plugin/macro/FormRadio.py data/plugin/macro/FormSelect.py data/plugin/macro/FormSubmit.py data/plugin/macro/FormText.py data/plugin/macro/FormTextarea.py data/plugin/macro/FormUpload.py |
| diffstat | 11 files changed, 59 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/data/plugin/macro/FormBase.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormBase.py Mon Mar 25 16:34:37 2013 +0100 @@ -12,9 +12,9 @@ @license: GNU GPL, see COPYING for details. """ -import sys from MoinMoin import wikiutil + class FormBase: debug = False @@ -29,12 +29,11 @@ self.msg = "" self.output = "" - ### Macro parameters ### - self._main = {} # Main parameters - self._attribs = {} # in FormField macros used as HTML tag attributes - self._params = {} # Additional parameters - ### ========== ### - + # Macro parameters + self._main = {} # Main parameters + self._attribs = {} # in FormField macros used as HTML tag attributes + self._params = {} # Additional parameters + def parse_args(self): """ Parse parameters into specific macro properties """ self._main, self._attribs, self._params = wikiutil.parse_quoted_separated(self.args) @@ -43,7 +42,8 @@ """ Validates macro parameters """ for name, value in self._attribs.iteritems(): if not hasattr(self, name): - self.msg = self._("Invalid attribute [%(attr)s] specified in macro [%(mod)s]" % {'attr':name, 'mod':self.module}) + self.msg = self._("Invalid attribute [%(attr)s] specified in macro [%(mod)s]" % { + 'attr': name, 'mod': self.module}) raise FormValidationError(self.msg) def build(self): @@ -77,20 +77,13 @@ return self.msg return self.output - - - - -############################################################################# -### Protected methods -############################################################################# def _build_attribs(self, attribs): """ Converts HTML element attributes from dictionary to string """ attrstr = "" for name, value in attribs.iteritems(): if value: - attrstr += "%(name)s=\"%(value)s\" " % {'name':name, 'value':value} + attrstr += "%(name)s=\"%(value)s\" " % {'name': name, 'value': value} return attrstr @@ -98,11 +91,12 @@ """ Builds HTML input element """ attrs = self._build_attribs(args) if name is None: - input = "<input type=\"%(type)s\" %(attrs)s/>\n" % {'type':type, 'attrs':attrs} + input = "<input type=\"%(type)s\" %(attrs)s/>\n" % {'type': type, 'attrs': attrs} else: - input = "<input type=\"%(type)s\" name=\"%(name)s\" %(attrs)s/>\n" % {'type':type, 'name':name, 'attrs':attrs} + input = "<input type=\"%(type)s\" name=\"%(name)s\" %(attrs)s/>\n" % { + 'type': type, 'name': name, 'attrs': attrs} return input - + + class FormValidationError(Exception): """ Exception raised for errors during validation """ - \ No newline at end of file
--- a/data/plugin/macro/FormCheckbox.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormCheckbox.py Mon Mar 25 16:34:37 2013 +0100 @@ -2,15 +2,13 @@ """ MoinMoin - FormCheckbox Macro - - @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ -#from wikiconfig.plugin.macro.FormField import FormField from FormField import FormField + class FormCheckbox(FormField): def __init__(self, macro, args): @@ -46,16 +44,16 @@ } } </script> - """ % {'true':self.true, 'false':self.false} + """ % {'true': self.true, 'false': self.false} inputId = self.label - checkboxId = self.label+"box" + checkboxId = self.label + "box" self._attribs["id"] = checkboxId - self._attribs["onclick"] = "checkbox(document.getElementById('"+checkboxId+"'), document.getElementById('"+inputId+"'))" + self._attribs["onclick"] = "checkbox(document.getElementById('" + checkboxId + "'), document.getElementById('" + inputId + "'))" - self.output += self._build_input("hidden", self.label, {'id':inputId, 'value':self.false}) + self.output += self._build_input("hidden", self.label, {'id': inputId, 'value': self.false}) self.output += self._build_input("checkbox", None, self._attribs) - + + def execute(macro, args): return FormCheckbox(macro, args).render() -
--- a/data/plugin/macro/FormField.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormField.py Mon Mar 25 16:34:37 2013 +0100 @@ -8,11 +8,12 @@ @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ + from MoinMoin import wikiutil -#from wikiconfig.plugin.macro.FormBase import FormBase, FormValidationError from FormBase import FormBase, FormValidationError + class FormField(FormBase): def __init__(self, macro, args): @@ -37,8 +38,7 @@ if not self.label: self.msg = self._("Field label is not defined") raise FormValidationError(self.msg) - - + def build(self): if not hasattr(self.request, "labels"): self.request.labels = [] @@ -48,5 +48,3 @@ self.request.labels.append(self.label) #self.output += self._build_input("hidden", self.label+"_index", {'value':self.index}) - -
--- a/data/plugin/macro/FormFooter.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormFooter.py Mon Mar 25 16:34:37 2013 +0100 @@ -2,19 +2,19 @@ """ MoinMoin - FormFooter Macro - - @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ from FormBase import FormBase + class FormFooter(FormBase): def build(self): self.output += self._build_input("hidden", "labels", {'value':';'.join(self.request.labels)}) self.output += "</form>\n" - + + def execute(macro, args): return FormFooter(macro, args).render()
--- a/data/plugin/macro/FormHeader.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormHeader.py Mon Mar 25 16:34:37 2013 +0100 @@ -9,8 +9,10 @@ """ from MoinMoin.Page import Page + from FormBase import FormBase + class FormHeader(FormBase): def parse_args(self): @@ -42,34 +44,31 @@ def validate(self): FormBase.validate(self) if not self.action: - self.msg = self._("No action was specified in macro [%(macro)s]" % {'macro':self.module}) + self.msg = self._("No action was specified in macro [%(macro)s]" % {'macro': self.module}) raise FormValidationError(self.msg) def build(self): self.output += "<form enctype=\"multipart/form-data\" action=\"\" method=\"post\">\n" - self.output += self._build_input("hidden", "doit", {'value':"Do it"}) - self.output += self._build_input("hidden", "action", {'value':self.action}) + self.output += self._build_input("hidden", "doit", {'value': "Do it"}) + self.output += self._build_input("hidden", "action", {'value': self.action}) if self.actions: for action in self.actions: - self.output += self._build_input("hidden", "actions[]", {'value':action}) + self.output += self._build_input("hidden", "actions[]", {'value': action}) if self.targetfile: - self.output += self._build_input("hidden", "targetfile", {'value':self.targetfile}) + self.output += self._build_input("hidden", "targetfile", {'value': self.targetfile}) if self.targetemail: - self.output += self._build_input("hidden", "targetemail", {'value':self.targetemail}) + self.output += self._build_input("hidden", "targetemail", {'value': self.targetemail}) if self.targetpage: page = Page(self.request, self.targetpage) if page.isStandardPage(False): - self.output += self._build_input("hidden", "targetpage", {'value':self.targetpage}) + self.output += self._build_input("hidden", "targetpage", {'value': self.targetpage}) else: - self.output += self._("Targetpage [%(targetpage)s] does not exists" % {'targetpage':self.targetpage}) - - + self.output += self._("Targetpage [%(targetpage)s] does not exists" % {'targetpage': self.targetpage}) + def execute(macro, args): return FormHeader(macro, args).render() - -
--- a/data/plugin/macro/FormRadio.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormRadio.py Mon Mar 25 16:34:37 2013 +0100 @@ -2,14 +2,13 @@ """ MoinMoin - FormRadio Macro - - @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ from FormField import FormField + class FormRadio(FormField): def __init(self, macro, args): @@ -37,6 +36,6 @@ #self.output += self._build_input("hidden", "labels[]", {'value':self.label}) self.output += self._build_input("radio", self.label, self._attribs) + def execute(macro, args): return FormRadio(macro, args).render() -
--- a/data/plugin/macro/FormSelect.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormSelect.py Mon Mar 25 16:34:37 2013 +0100 @@ -2,14 +2,13 @@ """ MoinMoin - FormSelect Macro - - @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ from FormField import FormField + class FormSelect(FormField): def __init__(self, macro, args): @@ -28,12 +27,12 @@ def build(self): FormField.build(self) #self.output += self._build_input("hidden", "labels[]", {'value':self.label}) - self.output += "<select name=\"%(label)s\" %(attribs)s>\n" % {'label':self.label, 'attribs':self._attribs} + self.output += "<select name=\"%(label)s\" %(attribs)s>\n" % {'label': self.label, 'attribs': self._attribs} self.output += "<option value=\"\"></option>\n" for item in self.list: - self.output += "<option value=\"%(item)s\">%(item)s</option>\n" % {'item':item} + self.output += "<option value=\"%(item)s\">%(item)s</option>\n" % {'item': item} self.output += "</select>\n" + def execute(macro, args): return FormSelect(macro, args).render() -
--- a/data/plugin/macro/FormSubmit.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormSubmit.py Mon Mar 25 16:34:37 2013 +0100 @@ -2,14 +2,15 @@ """ MoinMoin - FormSubmit Macro - - @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ + from MoinMoin.security.textcha import TextCha + from FormField import FormField + class FormSubmit(FormField): def __init__(self, macro, args): @@ -23,9 +24,9 @@ self.value = self.label def build(self): - self.output += TextCha(self.request).render(); - self.output += self._build_input("submit", None, {'value':self.value}) + self.output += TextCha(self.request).render() + self.output += self._build_input("submit", None, {'value': self.value}) + def execute(macro, args): return FormSubmit(macro, args).render() -
--- a/data/plugin/macro/FormText.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormText.py Mon Mar 25 16:34:37 2013 +0100 @@ -2,14 +2,13 @@ """ MoinMoin - FormText Macro - - @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ from FormField import FormField + class FormText(FormField): def __init__(self, macro, args): @@ -26,6 +25,6 @@ #self.output += self._build_input("hidden", "labels[]", {'value':self.label}) self.output += self._build_input("text", self.label, self._attribs) + def execute(macro, args): return FormText(macro, args).render() -
--- a/data/plugin/macro/FormTextarea.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormTextarea.py Mon Mar 25 16:34:37 2013 +0100 @@ -2,14 +2,13 @@ """ MoinMoin - FormTextarea Macro - - @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ from FormField import FormField + class FormTextarea(FormField): def __init__(self, macro, args): @@ -23,8 +22,9 @@ def build(self): FormField.build(self) #self.output += self._build_input("hidden", "labels[]", {'value':self.label}) - self.output += "<textarea name=\"%(label)s\" %(attribs)s></textarea>" % {'attribs':self._build_attribs(self._attribs), 'label':self.label} + self.output += "<textarea name=\"%(label)s\" %(attribs)s></textarea>" % { + 'attribs': self._build_attribs(self._attribs), 'label': self.label} + def execute(macro, args): return FormTextarea(macro, args).render() -
--- a/data/plugin/macro/FormUpload.py Mon Mar 25 16:16:43 2013 +0100 +++ b/data/plugin/macro/FormUpload.py Mon Mar 25 16:34:37 2013 +0100 @@ -2,14 +2,13 @@ """ MoinMoin - FormUpload Macro - - @copyright: 2008 by Peter Bodi <petrdll@centrum.sk> @license: GNU GPL, see COPYING for details. """ from FormField import FormField + class FormUpload(FormField): def __init__(self, macro, args): @@ -22,9 +21,9 @@ def build(self): FormField.build(self) - self.output += self._build_input("hidden", "uploadlabel", {'value':self.label}) + self.output += self._build_input("hidden", "uploadlabel", {'value': self.label}) self.output += self._build_input("file", "file", self._attribs) + def execute(macro, args): return FormUpload(macro, args).render() -