massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions

This commit is contained in:
souliane 2015-04-16 14:57:57 +02:00
commit 67ff77e5de
3 changed files with 272 additions and 271 deletions

View file

@ -46,7 +46,7 @@ def fixConfigOption(section, option, value, silent=True):
for file_ in C.CONFIG_FILES[::-1]:
# we will eventually update the existing file with the highest priority, if it's a user personal file...
if not silent:
log.debug(_("Testing file %s") % file_)
log.debug(_(u"Testing file %s") % file_)
if os.path.isfile(file_):
if file_.startswith(os.path.expanduser('~')):
config.read([file_])
@ -63,7 +63,7 @@ def fixConfigOption(section, option, value, silent=True):
if not silent:
if option in ('passphrase',): # list here the options storing a password
value = '******'
log.warning(_("Config auto-update: %(option)s set to %(value)s in the file %(config_file)s") %
log.warning(_(u"Config auto-update: %(option)s set to %(value)s in the file %(config_file)s") %
{'option': option, 'value': value, 'config_file': target_file})

View file

@ -60,9 +60,9 @@ class TriggerManager(object):
self.__triggers[point_name] = []
if priority != 0 and priority in [trigger_tuple[0] for trigger_tuple in self.__triggers[point_name]]:
if priority in (self.MIN_PRIORITY, self.MAX_PRIORITY):
log.warning(_("There is already a bound priority [%s]") % point_name)
log.warning(_(u"There is already a bound priority [%s]") % point_name)
else:
log.debug(_("There is already a trigger with the same priority [%s]") % point_name)
log.debug(_(u"There is already a trigger with the same priority [%s]") % point_name)
self.__triggers[point_name].append((priority, callback))
self.__triggers[point_name].sort(key=lambda trigger_tuple:
trigger_tuple[0], reverse=True)

View file

@ -153,7 +153,7 @@ def dataFormResult2AdvancedList(xmlui, form_xml):
for item_elt in item_elts:
for elt in item_elt.elements():
if elt.name != 'field':
log.warning("Unexpected tag (%s)" % elt.name)
log.warning(u"Unexpected tag (%s)" % elt.name)
continue
field = data_form.Field.fromElement(elt)