core: use of the new core.log module:
/!\ this is a massive refactoring and was largely automated, it probably did bring some bugs /!\
This commit is contained in:
parent
dc5c042fe7
commit
501bc92528
1 changed files with 707 additions and 941 deletions
|
|
@ -18,7 +18,8 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from sat.core.i18n import _
|
||||
from logging import debug, info, error, warning
|
||||
from sat.core.log import getLogger
|
||||
log = getLogger(__name__)
|
||||
from xml.dom import minidom, NotFoundErr
|
||||
from wokkel import data_form
|
||||
from twisted.words.xish import domish
|
||||
|
|
@ -46,7 +47,7 @@ def _dataFormField2XMLUIData(field):
|
|||
widget_type = 'text'
|
||||
if field.value is None:
|
||||
if field.label is None:
|
||||
warning(_("Fixed field has neither value nor label, ignoring it"))
|
||||
log.warning(_("Fixed field has neither value nor label, ignoring it"))
|
||||
field.value = ""
|
||||
else:
|
||||
field.value = field.label
|
||||
|
|
@ -65,7 +66,7 @@ def _dataFormField2XMLUIData(field):
|
|||
del widget_args[0]
|
||||
widget_kwargs["options"] = [(option.value, option.label or option.value) for option in field.options]
|
||||
else:
|
||||
error(u"FIXME FIXME FIXME: Type [%s] is not managed yet by SàT" % field.fieldType)
|
||||
log.error(u"FIXME FIXME FIXME: Type [%s] is not managed yet by SàT" % field.fieldType)
|
||||
widget_type = "string"
|
||||
|
||||
if field.var:
|
||||
|
|
@ -131,7 +132,7 @@ def dataFormResult2AdvancedList(xmlui, form_xml):
|
|||
for item_elt in item_elts:
|
||||
for elt in item_elt.elements():
|
||||
if elt.name != 'field':
|
||||
warning("Unexpected tag (%s)" % elt.name)
|
||||
log.warning("Unexpected tag (%s)" % elt.name)
|
||||
continue
|
||||
field = data_form.Field.fromElement(elt)
|
||||
|
||||
|
|
@ -699,7 +700,7 @@ class ListWidget(InputWidget):
|
|||
style = set()
|
||||
styles = set(style)
|
||||
if not options:
|
||||
warning(_('empty "options" list'))
|
||||
log.warning(_('empty "options" list'))
|
||||
if not styles.issubset(['multi']):
|
||||
raise exceptions.DataError(_("invalid styles"))
|
||||
super(ListWidget, self).__init__(xmlui, name, parent)
|
||||
|
|
|
|||
Loading…
Reference in a new issue