thread is optional in a Message

This commit is contained in:
Christophe Benz 2010-11-19 12:05:30 +01:00 committed by Romain Bignon
commit 9a13c44094

View file

@ -69,7 +69,7 @@ class Message(CapBaseObject):
@property @property
def full_id(self): def full_id(self):
return '%s.%s' % (self.thread.id, self.id) return '%s.%s' % (self.thread.id, self.id) if thread else self.id
@property @property
def full_parent_id(self): def full_parent_id(self):
@ -80,11 +80,14 @@ class Message(CapBaseObject):
elif self._parent_id is NotLoaded: elif self._parent_id is NotLoaded:
return NotLoaded return NotLoaded
else: else:
return '%s.%s' % (self.thread.id, self._parent_id) return '%s.%s' % (self.thread.id, self._parent_id) if thread else self._parent_id
def __eq__(self, msg): def __eq__(self, msg):
return unicode(self.thread.id) == unicode(msg.thread.id) and \ if self.thread:
unicode(self.id) == unicode(msg.id) return unicode(self.thread.id) == unicode(msg.thread.id) and \
unicode(self.id) == unicode(msg.id)
else:
return unicode(self.id) == unicode(msg.id)
def __repr__(self): def __repr__(self):
result = '<Message id="%s" title="%s" date="%s" from="%s">' % ( result = '<Message id="%s" title="%s" date="%s" from="%s">' % (