nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

If an error occurs during parsing, return the start of the tree instead of nothing

Browse Source
This commit is contained in:
Némunaire 2012-07-03 04:17:30 +02:00
parent be6b2970ae
commit 4ad92f29a2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module_states_file.py
View File

@ -28,6 +28,7 @@ class ModuleStatesFile(xml.sax.ContentHandler):
child = self.stack.pop() child = self.stack.pop()
size = len(self.stack) size = len(self.stack)
if size > 0: if size > 0:
self.stack[size - 1].content = self.stack[size - 1].content.strip()
self.stack[size - 1].addChild(child) self.stack[size - 1].addChild(child)
else: else:
self.root = child self.root = child
@ -40,7 +41,10 @@ def parse_file(filename):
parser.parse(open(filename, "r")) parser.parse(open(filename, "r"))
return mod.root return mod.root
except: except:
return module_state.ModuleState("nemubotstate") if mod.root is None:
return module_state.ModuleState("nemubotstate")
else:
return mod.root
def parse_string(string): def parse_string(string):
mod = ModuleStatesFile() mod = ModuleStatesFile()
@ -48,4 +52,7 @@ def parse_string(string):
xml.sax.parseString(string, mod) xml.sax.parseString(string, mod)
return mod.root return mod.root
except: except:
return module_state.ModuleState("nemubotstate") if mod.root is None:
return module_state.ModuleState("nemubotstate")
else:
return mod.root