jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #265 from anton-ryzhov/delay_plugins

Browse Source 
Check delay field existence
This commit is contained in:
Lance Stout 2013-10-23 11:09:05 -07:00
commit 08a0fd5420
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sleekxmpp/plugins/xep_0091/stanza.py
View File

@ -21,14 +21,15 @@ class LegacyDelay(ElementBase):
interfaces = set(('from', 'stamp', 'text')) interfaces = set(('from', 'stamp', 'text'))
def get_from(self): 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): def set_from(self, value):
self._set_attr('from', str(value)) self._set_attr('from', str(value))
def get_stamp(self): def get_stamp(self):
timestamp = self._get_attr('stamp') 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): def set_stamp(self, value):
if isinstance(value, dt.datetime): if isinstance(value, dt.datetime):

6
sleekxmpp/plugins/xep_0203/stanza.py
View File

@ -8,6 +8,7 @@
import datetime as dt import datetime as dt
from sleekxmpp.jid import JID
from sleekxmpp.xmlstream import ElementBase from sleekxmpp.xmlstream import ElementBase
from sleekxmpp.plugins import xep_0082 from sleekxmpp.plugins import xep_0082
@ -20,14 +21,15 @@ class Delay(ElementBase):
interfaces = set(('from', 'stamp', 'text')) interfaces = set(('from', 'stamp', 'text'))
def get_from(self): 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): def set_from(self, value):
self._set_attr('from', str(value)) self._set_attr('from', str(value))
def get_stamp(self): def get_stamp(self):
timestamp = self._get_attr('stamp') timestamp = self._get_attr('stamp')
return xep_0082.parse(timestamp) return xep_0082.parse(timestamp) if timestamp else None
def set_stamp(self, value): def set_stamp(self, value):
if isinstance(value, dt.datetime): if isinstance(value, dt.datetime):