diff options
Diffstat (limited to 'ishtar_common/ooo_replace.py')
| -rw-r--r-- | ishtar_common/ooo_replace.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ishtar_common/ooo_replace.py b/ishtar_common/ooo_replace.py index cf1c89051..18c4e1878 100644 --- a/ishtar_common/ooo_replace.py +++ b/ishtar_common/ooo_replace.py @@ -79,7 +79,7 @@ def _format_value(value, default_value): c_locale[1] = c_locale[1].upper() c_locale = "_".join(c_locale) if locale.getlocale()[0] != c_locale: - for loc in (c_locale, c_locale+'.utf8'): + for loc in (c_locale, c_locale + '.utf8'): try: locale.setlocale(locale.LC_ALL, loc) break @@ -159,8 +159,8 @@ def _ooo_replace(content, context, missing_keys, default_value=''): # regular ooo parsing for xp in ('variable-set', 'variable-get'): - for p in content.findall(".//"+OOO_NS+xp): - name = p.get(OOO_NS+"name") + for p in content.findall(".//" + OOO_NS + xp): + name = p.get(OOO_NS + "name") if name in context: value = context[name] p.text = _format_value(value, default_value) @@ -168,11 +168,11 @@ def _ooo_replace(content, context, missing_keys, default_value=''): if default_value is not None: p.text = default_value missing_keys.add(name) - for p in content.findall(".//"+OOO_NS+"conditional-text"): - condition = p.get(OOO_NS+"condition") + for p in content.findall(".//" + OOO_NS + "conditional-text"): + condition = p.get(OOO_NS + "condition") res = 'true' if _parse_condition(condition, context, default_value) \ else 'false' - value = p.get(OOO_NS+'string-value-if-' + res) + value = p.get(OOO_NS + 'string-value-if-' + res) value = _format_value(value, default_value) if value.strip() in context: value = context[value.strip()] |