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
parent 0b06261d18
commit a7b166498c
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
importer.py
View File

@ -191,8 +191,12 @@ class ModuleLoader(SourceLoader):
module.del_event = del_event
if not hasattr(module, "NODATA"):
module.DATAS = parse_file(os.path.join(self.context.data_path,
module.__name__ + ".xml"))
data_file = os.path.join(self.context.data_path,
module.__name__ + ".xml")
if os.path.isfile(data_file):
module.DATAS = parse_file(data_file)
else:
module.DATAS = module_state.ModuleState("nemubotstate")
module.save = mod_save
else:
module.DATAS = None

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