Merge pull request #265 from anton-ryzhov/delay_plugins
Check delay field existence
This commit is contained in:
commit
08a0fd5420
2 changed files with 7 additions and 4 deletions
|
@ -21,14 +21,15 @@ class LegacyDelay(ElementBase):
|
|||
interfaces = set(('from', 'stamp', 'text'))
|
||||
|
||||
def get_from(self):
|
||||
return JID(self._get_attr('from'))
|
||||
from_ = self._get_attr('from')
|
||||
return JID(from_) if from_ else None
|
||||
|
||||
def set_from(self, value):
|
||||
self._set_attr('from', str(value))
|
||||
|
||||
def get_stamp(self):
|
||||
timestamp = self._get_attr('stamp')
|
||||
return xep_0082.parse('%sZ' % timestamp)
|
||||
return xep_0082.parse('%sZ' % timestamp) if timestamp else None
|
||||
|
||||
def set_stamp(self, value):
|
||||
if isinstance(value, dt.datetime):
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
import datetime as dt
|
||||
|
||||
from sleekxmpp.jid import JID
|
||||
from sleekxmpp.xmlstream import ElementBase
|
||||
from sleekxmpp.plugins import xep_0082
|
||||
|
||||
|
@ -20,14 +21,15 @@ class Delay(ElementBase):
|
|||
interfaces = set(('from', 'stamp', 'text'))
|
||||
|
||||
def get_from(self):
|
||||
return JID(self._get_attr('from'))
|
||||
from_ = self._get_attr('from')
|
||||
return JID(from_) if from_ else None
|
||||
|
||||
def set_from(self, value):
|
||||
self._set_attr('from', str(value))
|
||||
|
||||
def get_stamp(self):
|
||||
timestamp = self._get_attr('stamp')
|
||||
return xep_0082.parse(timestamp)
|
||||
return xep_0082.parse(timestamp) if timestamp else None
|
||||
|
||||
def set_stamp(self, value):
|
||||
if isinstance(value, dt.datetime):
|
||||
|
|
Loading…
Reference in a new issue