PEP8 clean

This commit is contained in:
nemunaire 2014-11-09 14:11:54 +01:00
commit e17996d858
23 changed files with 496 additions and 331 deletions

View file

@ -25,56 +25,59 @@ from . import node as module_state
logger = logging.getLogger("nemubot.xmlparser")
class ModuleStatesFile(xml.sax.ContentHandler):
def startDocument(self):
self.root = None
self.stack = list()
def startDocument(self):
self.root = None
self.stack = list()
def startElement(self, name, attrs):
cur = module_state.ModuleState(name)
def startElement(self, name, attrs):
cur = module_state.ModuleState(name)
for name in attrs.keys():
cur.setAttribute(name, attrs.getValue(name))
for name in attrs.keys():
cur.setAttribute(name, attrs.getValue(name))
self.stack.append(cur)
self.stack.append(cur)
def characters(self, content):
self.stack[len(self.stack)-1].content += content
def characters(self, content):
self.stack[len(self.stack)-1].content += content
def endElement(self, name):
child = self.stack.pop()
size = len(self.stack)
if size > 0:
self.stack[size - 1].content = self.stack[size - 1].content.strip()
self.stack[size - 1].addChild(child)
else:
self.root = child
def endElement(self, name):
child = self.stack.pop()
size = len(self.stack)
if size > 0:
self.stack[size - 1].content = self.stack[size - 1].content.strip()
self.stack[size - 1].addChild(child)
else:
self.root = child
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 = 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
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
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