From b679e4d2618d7c4f30408d7de3de7fd323e002ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 25 Mar 2016 12:22:07 +0100 Subject: [PATCH] Fix extract_report_genshi for old Relatorio version Fall-back to 'xml' factory because only version greater than 0.6.2 of Relatorio has the factory 'markup' before it was named 'xml'. --- trytond/ir/translation.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py index 2541d57349..40b10ab7f1 100644 --- a/trytond/ir/translation.py +++ b/trytond/ir/translation.py @@ -1055,15 +1055,18 @@ class TranslationSet(Wizard): for _, _, string, _ in genshi_extract( content, keywords, comment_tags, options): yield string + if not template_class: + raise ValueError('a template class is required') return method - extract_report_plain = extract_report_genshi( - MIMETemplateLoader().factories['text']) + factories = MIMETemplateLoader().factories + extract_report_plain = extract_report_genshi(factories['text']) extract_report_xml = extract_report_genshi( - MIMETemplateLoader().factories['markup']) + factories.get('markup', factories.get('xml'))) extract_report_html = extract_report_genshi( - MIMETemplateLoader().factories['markup']) + factories.get('markup', factories.get('xml'))) extract_report_xhtml = extract_report_genshi( - MIMETemplateLoader().factories['markup']) + factories.get('markup', factories.get('xml'))) + del factories def set_report(self): pool = Pool()