copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure data tuple is deleted

This commit is contained in:
Dimitur Kirov 2006-02-18 10:16:34 +00:00
parent d513b7372b
commit e748ad7990
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/xmpp/simplexml.py
View File

@ -301,9 +301,15 @@ class NodeBuilder:
if data: if data:
self._parser.Parse(data,1) self._parser.Parse(data,1)
def check_data_buffer(self):
if self.data_buffer:
self._ptr.data.append(''.join(self.data_buffer))
del self.data_buffer[:]
self.data_buffer = None
def destroy(self): def destroy(self):
""" Method used to allow class instance to be garbage-collected. """ """ Method used to allow class instance to be garbage-collected. """
self.check_data_buffer()
self._parser.StartElementHandler = None self._parser.StartElementHandler = None
self._parser.EndElementHandler = None self._parser.EndElementHandler = None
self._parser.CharacterDataHandler = None self._parser.CharacterDataHandler = None
@ -311,6 +317,7 @@ class NodeBuilder:
def starttag(self, tag, attrs): def starttag(self, tag, attrs):
"""XML Parser callback. Used internally""" """XML Parser callback. Used internally"""
self.check_data_buffer()
attlist=attrs.keys() # attlist=attrs.keys() #
for attr in attlist: # FIXME: Crude hack. And it also slows down the whole library considerably. for attr in attlist: # FIXME: Crude hack. And it also slows down the whole library considerably.
sp=attr.rfind(" ") # sp=attr.rfind(" ") #
@ -339,9 +346,7 @@ class NodeBuilder:
def endtag(self, tag ): def endtag(self, tag ):
"""XML Parser callback. Used internally""" """XML Parser callback. Used internally"""
self.DEBUG(DBG_NODEBUILDER, "DEPTH -> %i , tag -> %s" % (self.__depth, tag), 'up') self.DEBUG(DBG_NODEBUILDER, "DEPTH -> %i , tag -> %s" % (self.__depth, tag), 'up')
if self.data_buffer: self.check_data_buffer()
self._ptr.data.append(''.join(self.data_buffer))
self.data_buffer = None
if self.__depth == self._dispatch_depth: if self.__depth == self._dispatch_depth:
self.dispatch(self._mini_dom) self.dispatch(self._mini_dom)
elif self.__depth > self._dispatch_depth: elif self.__depth > self._dispatch_depth:
@ -360,32 +365,26 @@ class NodeBuilder:
self.data_buffer = [data] self.data_buffer = [data]
self.last_is_data = 1 self.last_is_data = 1
def handle_data(self, data, *args):
"""XML Parser callback. Used internally"""
self.DEBUG(DBG_NODEBUILDER, data, 'data')
if not self._ptr: return
if self.last_is_data:
self._ptr.data[-1] += data
else:
self._ptr.data.append(data)
self.last_is_data = 1
def handle_namespace_start(self, prefix, uri): def handle_namespace_start(self, prefix, uri):
"""XML Parser callback. Used internally""" """XML Parser callback. Used internally"""
self.check_data_buffer()
if prefix: self.namespaces[uri]=prefix+':' if prefix: self.namespaces[uri]=prefix+':'
else: self.xmlns=uri else: self.xmlns=uri
def DEBUG(self, level, text, comment=None): def DEBUG(self, level, text, comment=None):
""" Gets all NodeBuilder walking events. Can be used for debugging if redefined.""" """ Gets all NodeBuilder walking events. Can be used for debugging if redefined."""
def getDom(self): def getDom(self):
""" Returns just built Node. """ """ Returns just built Node. """
self.check_data_buffer()
return self._mini_dom return self._mini_dom
def dispatch(self,stanza): def dispatch(self,stanza):
""" Gets called when the NodeBuilder reaches some level of depth on it's way up with the built """ Gets called when the NodeBuilder reaches some level of depth on it's way up with the built
node as argument. Can be redefined to convert incoming XML stanzas to program events. """ node as argument. Can be redefined to convert incoming XML stanzas to program events. """
def stream_header_received(self,ns,tag,attrs): def stream_header_received(self,ns,tag,attrs):
""" Method called when stream just opened. """ """ Method called when stream just opened. """
self.check_data_buffer()
def stream_footer_received(self): def stream_footer_received(self):
""" Method called when stream just closed. """ """ Method called when stream just closed. """
self.check_data_buffer()
def XML2Node(xml): def XML2Node(xml):
""" Converts supplied textual string into XML node. Handy f.e. for reading configuration file. """ Converts supplied textual string into XML node. Handy f.e. for reading configuration file.