nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

xmlparser: don't manage errors at this level

Browse source
This commit is contained in:
nemunaire 2014-12-16 00:56:47 +01:00
commit a7b166498c
2 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tools/xmlparser/__init__.py
View file

@ -54,28 +54,11 @@ def parse_file(filename):
parser = xml.sax.make_parser()
mod = ModuleStatesFile()
parser.setContentHandler(mod)
try:
parser.parse(open(filename, "r"))
return mod.root
except IOError:
logger.exception("error occurs during XML parsing of %s", filename)
return module_state.ModuleState("nemubotstate")
except:
logger.exception("error occurs during XML parsing of %s", filename)
if mod.root is None:
return module_state.ModuleState("nemubotstate")
else:
return mod.root
parser.parse(open(filename, "r"))
return mod.root
def parse_string(string):
mod = ModuleStatesFile()
try:
xml.sax.parseString(string, mod)
return mod.root
except:
logger.exception("error occurs during XML parsing")
if mod.root is None:
return module_state.ModuleState("nemubotstate")
else:
return mod.root
xml.sax.parseString(string, mod)
return mod.root