rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[px] PXs can be called by other PXs.

Browse source
This commit is contained in:
Gaetan Delannay 2013-03-22 12:52:24 +01:00
parent bfbf9bea82
commit 2a145ac890
5 changed files with 52 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
px/px_parser.py
View file

@ -54,6 +54,8 @@ class PxEnvironment(XmlEnvironment):
class PxParser(XmlParser):
'''PX parser that is specific for parsing PX data.'''
pxAttributes = ('var', 'for', 'if')
# No-end tags
noEndTags = ('br', 'img')
def __init__(self, env, caller=None):
XmlParser.__init__(self, env, caller)
@ -78,7 +80,7 @@ class PxParser(XmlParser):
e.currentBuffer.addElement(elem, elemType='px')
if elem != 'x':
e.currentBuffer.dumpStartElement(elem, attrs,
ignoreAttrs=self.pxAttributes)
ignoreAttrs=self.pxAttributes, noEndTag=elem in self.noEndTags)
def endElement(self, elem):
e = self.env
@ -88,7 +90,8 @@ class PxParser(XmlParser):
e.currentBuffer.addExpression(e.currentContent)
e.currentContent = ''
# Dump the end element into the current buffer
if elem != 'x': e.currentBuffer.dumpEndElement(elem)
if (elem != 'x') and (elem not in self.noEndTags):
e.currentBuffer.dumpEndElement(elem)
# If this element is the main element of the current buffer, we must
# pop it and continue to work in the parent buffer.
if e.isActionElem(elem):