Changeset 461
- Timestamp:
- 02/27/03 17:03:48 (6 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBMessaging/RBMessaging/Client/Handlers/Message.py
r459 r461 87 87 print 88 88 for stream in packet.datastreams: 89 print 'RoutedData:', repr(stream.GetStreamData()) 89 datarepr = repr(stream.GetStreamData())[1:-1] 90 if len(datarepr) > 60: 91 datarepr = '"%s"...' % (datarepr[:60],) 92 else: datarepr = '"%s"' % (datarepr,) 93 print 'RoutedData:', datarepr 90 94 print 91 95 … … 95 99 print 96 100 for stream in packet.datastreams: 97 print 'StreamData:', repr(stream.GetStreamData()) 101 datarepr = repr(stream.GetStreamData())[1:-1] 102 if len(datarepr) > 60: 103 datarepr = '"%s"...' % (datarepr[:60],) 104 else: datarepr = '"%s"' % (datarepr,) 105 print 'StreamData:', datarepr 98 106 print 107 self.connection.LastMsg = packet 99 108 trunk/RBTelepathy/RBTelepathy/Packet/Elements.py
r456 r461 44 44 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 45 45 46 def UpdateContent(self, parent, *args, **kw): 46 def UpdateContent(self, parents=None, *args, **kw): 47 parents = parents or [] 48 parents.append(self) 47 49 for node in self.iternodes(): 48 node.UpdateContent(self, *args, **kw) 49 self.OnUpdateContent(parent, *args, **kw) 50 51 def OnUpdateContent(self, parent, root): 50 node.UpdateContent(parents, *args, **kw) 51 parents.pop() 52 self.OnUpdateContent(parents, *args, **kw) 53 54 def OnUpdateContent(self, parents): 52 55 pass 53 56 … … 70 73 71 74 def GetStreamHeader(self): 72 self.UpdateContent( self, self)75 self.UpdateContent() 73 76 return self.toxml() 74 77 … … 108 111 def toxml(self, *args, **kw): 109 112 self.datastreams = [] 110 self.UpdateContent( self, self)113 self.UpdateContent() 111 114 return RootElementBase.toxml(self, *args, **kw) 112 115 … … 131 134 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 132 135 133 def OnUpdateContent(self, parent, root):136 def OnUpdateContent(self, *args, **kw): 134 137 try: self.attrs['addr'] = str(self._addr) 135 138 except AttributeError: pass 136 139 137 140 def toxml(self, *args, **kw): 138 self.OnUpdateContent( None, None)141 self.OnUpdateContent() 139 142 return PacketElementBase.toxml(self, *args, **kw) 140 143 trunk/RBTelepathy/RBTelepathy/Packet/StreamElements.py
r458 r461 41 41 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 42 42 43 def OnUpdateContent(self, parent, root): 44 PacketElementBase.OnUpdateContent(self, parent, root) 45 root.datastreams.append(self) 43 def OnUpdateContent(self, parents): 44 PacketElementBase.OnUpdateContent(self, parents) 45 try: parents[0].datastreams.append(self) 46 except (KeyError, AttributeError): pass 46 47 47 48 #~ content property ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ … … 76 77 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 77 78 78 def OnUpdateContent(self, parent , root):79 StreamBase.OnUpdateContent(self, parent , root)79 def OnUpdateContent(self, parents): 80 StreamBase.OnUpdateContent(self, parents) 80 81 size = len(self.content) 81 82 self.size = size … … 127 128 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 128 129 129 def OnUpdateContent(self, parent , root):130 StreamBase.OnUpdateContent(self, parent , root)130 def OnUpdateContent(self, parents): 131 StreamBase.OnUpdateContent(self, parents) 131 132 self.attrs['ordinal'] = str(self.ordinal) 132 133
