diff options
| author | Håkon Vågsether <haakonsv@gmail.com> | 2019-07-25 20:27:11 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-07-28 12:04:41 +0200 |
| commit | 621194e2e5084906648a88a369a879db569e70ae (patch) | |
| tree | e9a0deceb6ca4021825d997172ecd9f8a93c8fed /grc/core | |
| parent | cdc279627725255948c950f3a820aff5eadb9067 (diff) | |
grc: Fix XML loading without lxml
Diffstat (limited to 'grc/core')
| -rw-r--r-- | grc/core/platform.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/grc/core/platform.py b/grc/core/platform.py index 62795a12cf..6aeaef2367 100644 --- a/grc/core/platform.py +++ b/grc/core/platform.py @@ -328,6 +328,7 @@ class Platform(Element): @throws exception if the validation fails """ filename = filename or self.config.default_flow_graph + is_xml = False with open(filename, encoding='utf-8') as fp: is_xml = '<flow_graph>' in fp.read(100) fp.seek(0) @@ -336,10 +337,11 @@ class Platform(Element): data = yaml.safe_load(fp) validator = schema_checker.Validator(schema_checker.FLOW_GRAPH_SCHEME) validator.run(data) - else: - Messages.send('>>> Converting from XML\n') - from ..converter.flow_graph import from_xml - data = from_xml(fp) + + if is_xml: + Messages.send('>>> Converting from XML\n') + from ..converter.flow_graph import from_xml + data = from_xml(filename) return data |