cubicweb: comparison web/formwidgets.py

equal deleted inserted replaced

-:96d57cb8b644
+:1f41697f2e26
 """
 __docformat__ = "restructuredtext en"
 from functools import reduce
 from datetime import date
-from warnings import warn
 from six import text_type, string_types
 from logilab.mtconverter import xml_escape
-from logilab.common.deprecation import deprecated
 from logilab.common.date import todatetime
 from cubicweb import tags, uilib
 from cubicweb.utils import json_dumps
 from cubicweb.web import stdmsgs, INTERNAL_FIELD_VALUE, ProcessFormError
 :attr:`settabindex` attributes)
 """
 attrs = dict(self.attrs)
 if self.setdomid:
 attrs['id'] = field.dom_id(form, self.suffix)
-if self.settabindex and not 'tabindex' in attrs:
+if self.settabindex and 'tabindex' not in attrs:
 attrs['tabindex'] = form._cw.next_tabindex()
 if 'placeholder' in attrs:
 attrs['placeholder'] = form._cw._(attrs['placeholder'])
 return attrs
 class HiddenInput(Input):
 """Simple <input type='hidden'> for hidden value, will return a unicode
 string.
 """
 type = 'hidden'
-setdomid = False # by default, don't set id attribute on hidden input
+setdomid = False  # by default, don't set id attribute on hidden input
 settabindex = False
 class ButtonInput(Input):
 """Simple <input type='button'>, will return a unicode string.
 selected='selected', **oattrs))
 else:
 options.append(tags.option(label, value=value, **oattrs))
 if optgroup_opened:
 options.append(u'</optgroup>')
-if not 'size' in attrs:
+if 'size' not in attrs:
 if self._multiple:
 size = text_type(min(self.default_size, len(vocab) or 1))
 else:
 size = u'1'
 attrs['size'] = size
 else:
 if value not in values:
 options.append(tags.option(label, value=value))
 if 'size' not in attrs:
 attrs['size'] = self.default_size
-if 'id' in attrs :
+if 'id' in attrs:
 attrs.pop('id')
 return tags.select(name=name, multiple=self._multiple, id=name,
 options=options, **attrs) + '\n'.join(inputs)
 def _render(self, form, field, renderer):
 domid = field.dom_id(form)
 jsnodes = {'widgetid': domid,
 'from': 'from_' + domid,
 % (jsnodes['widgetid'], jsnodes['from'], jsnodes['to']))
 field.required = True
 return (self.template %
 {'widgetid': jsnodes['widgetid'],
 # helpinfo select tag
-'inoutinput' : self.render_select(form, field, jsnodes['from']),
+'inoutinput': self.render_select(form, field, jsnodes['from']),
 # select tag with resultats
-'resinput' : self.render_select(form, field, jsnodes['to'], selected=True),
+'resinput': self.render_select(form, field, jsnodes['to'], selected=True),
-'addinput' : self.add_button % jsnodes,
+'addinput': self.add_button % jsnodes,
 'removeinput': self.remove_button % jsnodes
 })
 class BitSelect(Select):
 year, month = value.year, value.month
 return (u"""<a onclick="toggleCalendar('%s', '%s', %s, %s);" class="calhelper">
 <img src="%s" title="%s" alt="" /></a><div class="calpopup hidden" id="%s"></div>"""
 % (helperid, inputid, year, month,
 form._cw.uiprops['CALENDAR_ICON'],
-form._cw._('calendar'), helperid) )
+form._cw._('calendar'), helperid))
 class JQueryDatePicker(FieldWidget):
 """Use jquery.ui.datepicker to define a date picker. Will return the date as
 a unicode string.
 self.separator = separator
 def _render(self, form, field, renderer):
 domid = field.dom_id(form, self.suffix)
 form._cw.add_onload(u'cw.jqNode("%s").timePicker({step: %s, separator: "%s"})' % (
 domid, self.timesteps, self.separator))
 return self._render_input(form, field)
 class JQueryDateTimePicker(FieldWidget):
 """Compound widget using :class:`JQueryDatePicker` and
 timestr = req.format_time(self.initialtime)
 datepicker = JQueryDatePicker(datestr=datestr, suffix='date')
 timepicker = JQueryTimePicker(timestr=timestr, timesteps=self.timesteps,
 suffix='time')
 return u'<div id="%s">%s%s</div>' % (field.dom_id(form),
 datepicker.render(form, field, renderer),
 timepicker.render(form, field, renderer))
 def process_field_data(self, form, field):
 req = form._cw
 datestr = req.form.get(field.input_name(form, 'date')).strip() or None
 timestr = req.form.get(field.input_name(form, 'time')).strip() or None
 fname = self.autocomplete_initfunc
 return entity._cw.build_url('ajax', fname=fname, mode='remote',
 pageid=entity._cw.pageid)
 class StaticFileAutoCompletionWidget(AutoCompletionWidget):
 """XXX describe me"""
 wdgtype = 'StaticFileSuggestField'
 def _get_url(self, entity, field):
 class LazyRestrictedAutoCompletionWidget(RestrictedAutoCompletionWidget):
 """remote autocomplete """
 def values_and_attributes(self, form, field):
 """override values_and_attributes to handle initial displayed values"""
-values, attrs = super(LazyRestrictedAutoCompletionWidget, self).values_and_attributes(form, field)
+values, attrs = super(LazyRestrictedAutoCompletionWidget, self).values_and_attributes(
+form, field)
 assert len(values) == 1, "multiple selection is not supported yet by LazyWidget"
 if not values[0]:
-values = form.cw_extra_kwargs.get(field.name,'')
+values = form.cw_extra_kwargs.get(field.name, '')
 if not isinstance(values, (tuple, list)):
 values = (values,)
 try:
 values = list(values)
 values[0] = int(values[0])
 return u'<div>%s %s %s %s</div>' % (
 form._cw._('from_interval_start'),
 actual_fields[0].render(form, renderer),
 form._cw._('to_interval_end'),
 actual_fields[1].render(form, renderer),
 )
 class HorizontalLayoutWidget(FieldWidget):
 """Custom widget to display a set of fields grouped together horizontally in
 a form. See `IntervalWidget` for example usage.
 """
 def _render(self, form, field, renderer):
 if self.attrs.get('display_label', True):
 subst = self.attrs.get('label_input_substitution', '%(label)s %(input)s')
 fields = [subst % {'label': renderer.render_label(form, f),
 'input': f.render(form, renderer)}
 for f in field.subfields(form)]
 else:
 fields = [f.render(form, renderer) for f in field.subfields(form)]
 return u'<div>%s</div>' % ' '.join(fields)
 def _render(self, form, field, renderer):
 assert self.suffix is None, 'not supported'
 req = form._cw
 pathqname = field.input_name(form, 'path')
-fqsqname = field.input_name(form, 'fqs') # formatted query string
+fqsqname = field.input_name(form, 'fqs')  # formatted query string
 if pathqname in form.form_previous_values:
 path = form.form_previous_values[pathqname]
 fqs = form.form_previous_values[fqsqname]
 else:
 if field.name in req.form:
 path = qs = ''
 fqs = u'\n'.join(u'%s=%s' % (k, v) for k, v in req.url_parse_qsl(qs))
 attrs = dict(self.attrs)
 if self.setdomid:
 attrs['id'] = field.dom_id(form)
-if self.settabindex and not 'tabindex' in attrs:
+if self.settabindex and 'tabindex' not in attrs:
 attrs['tabindex'] = req.next_tabindex()
 # ensure something is rendered
 inputs = [u'<table><tr><th>',
 req._('i18n_bookmark_url_path'),
 u'</th><td>',
 line = line.strip()
 if line:
 try:
 key, val = line.split('=', 1)
 except ValueError:
-raise ProcessFormError(req._("wrong query parameter line %s") % (i+1))
+msg = req._("wrong query parameter line %s") % (i + 1)
+raise ProcessFormError(msg)
 # value will be url quoted by build_url_params
 values.setdefault(key, []).append(val)
 if not values:
 return path
 return u'%s?%s' % (path, req.build_url_params(**values))
 attrs['onclick'] = self.onclick
 if self.name:
 attrs['name'] = self.name
 if self.setdomid:
 attrs['id'] = self.name
-if self.settabindex and not 'tabindex' in attrs:
+if self.settabindex and 'tabindex' not in attrs:
 attrs['tabindex'] = form._cw.next_tabindex()
 if self.icon:
 img = tags.img(src=form._cw.uiprops[self.icon], alt=self.icon)
 else:
 img = u''
 def render(self, form, field=None, renderer=None):
 label = form._cw._(self.label)
 imgsrc = form._cw.uiprops[self.imgressource]
 return '<a id="%(domid)s" href="%(href)s">'\
 '<img src="%(imgsrc)s" alt="%(label)s"/>%(label)s</a>' % {
 'label': label, 'imgsrc': imgsrc,
 'domid': self.domid, 'href': self.href}

changeset 11049	1f41697f2e26
parent 11048	96d57cb8b644