From a10e3925d52873a35f3b220e9a6c48fd19372136 Mon Sep 17 00:00:00 2001 From: croneter Date: Mon, 26 Nov 2018 20:44:36 +0100 Subject: [PATCH] Catch cElementTree TypeError - Hopefully fixes #559 --- resources/lib/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lib/utils.py b/resources/lib/utils.py index 4b4f45fd..b0db93d4 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -652,8 +652,9 @@ class XmlKodiSetting(object): def __enter__(self): try: self.tree = defused_etree.parse(self.path) - except IOError: + except (IOError, TypeError): # Document is blank or missing + # OR (TypeError): Fuck-up if file is empty if self.force_create is False: LOG.debug('%s does not seem to exist; not creating', self.path) # This will abort __enter__ @@ -669,6 +670,7 @@ class XmlKodiSetting(object): self.filename, 'http://kodi.wiki')) self.__exit__(ParseError('Error parsing XML'), None, None) + raise ParseError self.root = self.tree.getroot() return self