nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Use expat parser instead of SAX to parse XML files

Browse Source
This commit is contained in:
nemunaire 2015-04-24 13:05:21 +02:00
parent 0f2f14ddda
commit 0fb58f0ff2
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nemubot/tools/xmlparser/__init__.py
View File

@ -16,14 +16,14 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import xml.sax import xml.parsers.expat
from nemubot.tools.xmlparser import node as module_state from nemubot.tools.xmlparser import node as module_state
class ModuleStatesFile(xml.sax.ContentHandler): class ModuleStatesFile:
def startDocument(self): def __init__(self):
self.root = None self.root = None
self.stack = list() self.stack = list()
@ -31,7 +31,7 @@ class ModuleStatesFile(xml.sax.ContentHandler):
cur = module_state.ModuleState(name) cur = module_state.ModuleState(name)
for name in attrs.keys(): for name in attrs.keys():
cur.setAttribute(name, attrs.getValue(name)) cur.setAttribute(name, attrs[name])
self.stack.append(cur) self.stack.append(cur)
@ -49,14 +49,18 @@ class ModuleStatesFile(xml.sax.ContentHandler):
def parse_file(filename): def parse_file(filename):
parser = xml.sax.make_parser() with open(filename, "r") as f:
mod = ModuleStatesFile() return parse_string(f.read())
parser.setContentHandler(mod)
parser.parse(open(filename, "r"))
return mod.root
def parse_string(string): def parse_string(string):
p = xml.parsers.expat.ParserCreate()
mod = ModuleStatesFile() mod = ModuleStatesFile()
xml.sax.parseString(string, mod)
p.StartElementHandler = mod.startElement
p.EndElementHandler = mod.endElement
p.CharacterDataHandler = mod.characters
p.Parse(string, 1)
return mod.root return mod.root

2
nemubot/tools/xmlparser/node.py
View File

@ -224,7 +224,7 @@ class ModuleState:
def save(self, filename): def save(self, filename):
"""Save the current node as root node in a XML file""" """Save the current node as root node in a XML file"""
with open(filename, "w") as f: with open(filename, "w") as f:
import xml.sax import xml.sax.saxutils
gen = xml.sax.saxutils.XMLGenerator(f, "utf-8") gen = xml.sax.saxutils.XMLGenerator(f, "utf-8")
gen.startDocument() gen.startDocument()
self.save_node(gen) self.save_node(gen)