equal
deleted
inserted
replaced
35 |
35 |
36 from cubicweb import _ |
36 from cubicweb import _ |
37 |
37 |
38 from warnings import warn |
38 from warnings import warn |
39 |
39 |
40 from six import text_type |
|
41 |
|
42 from logilab.mtconverter import xml_escape |
40 from logilab.mtconverter import xml_escape |
43 from logilab.common.registry import yes |
41 from logilab.common.registry import yes |
44 |
42 |
45 from cubicweb import tags, uilib |
43 from cubicweb import tags, uilib |
46 from cubicweb.appobject import AppObject |
44 from cubicweb.appobject import AppObject |
119 errormsg = self.error_message(form) |
117 errormsg = self.error_message(form) |
120 if errormsg: |
118 if errormsg: |
121 data.insert(0, errormsg) |
119 data.insert(0, errormsg) |
122 # NOTE: we call unicode because `tag` objects may be found within data |
120 # NOTE: we call unicode because `tag` objects may be found within data |
123 # e.g. from the cwtags library |
121 # e.g. from the cwtags library |
124 w(''.join(text_type(x) for x in data)) |
122 w(''.join(str(x) for x in data)) |
125 |
123 |
126 def render_content(self, w, form, values): |
124 def render_content(self, w, form, values): |
127 if self.display_progress_div: |
125 if self.display_progress_div: |
128 w(u'<div id="progress">%s</div>' % self._cw._('validating...')) |
126 w(u'<div id="progress">%s</div>' % self._cw._('validating...')) |
129 w(u'\n<fieldset>\n') |
127 w(u'\n<fieldset>\n') |