summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-10-23 11:09:05 -0700
committerLance Stout <lancestout@gmail.com>2013-10-23 11:09:05 -0700
commit08a0fd5420c25108d3bff4096a2378fd2f288a50 (patch)
tree5772c82b4881ac3eaee1fec5becaa8bfbdfcb8e3 /sleekxmpp
parentfb5d20c4f8993bf35c8e8653fec8d9795e8e6f05 (diff)
parent92d6bc68756314b46e71b2d8633d6cf1d22b8b26 (diff)
downloadslixmpp-08a0fd5420c25108d3bff4096a2378fd2f288a50.tar.gz
slixmpp-08a0fd5420c25108d3bff4096a2378fd2f288a50.tar.bz2
slixmpp-08a0fd5420c25108d3bff4096a2378fd2f288a50.tar.xz
slixmpp-08a0fd5420c25108d3bff4096a2378fd2f288a50.zip
Merge pull request #265 from anton-ryzhov/delay_plugins
Check delay field existence
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/plugins/xep_0091/stanza.py5
-rw-r--r--sleekxmpp/plugins/xep_0203/stanza.py6
2 files changed, 7 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0091/stanza.py b/sleekxmpp/plugins/xep_0091/stanza.py
index 0b70ff63..17e55764 100644
--- a/sleekxmpp/plugins/xep_0091/stanza.py
+++ b/sleekxmpp/plugins/xep_0091/stanza.py
@@ -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):
diff --git a/sleekxmpp/plugins/xep_0203/stanza.py b/sleekxmpp/plugins/xep_0203/stanza.py
index 9a11cae9..e147e975 100644
--- a/sleekxmpp/plugins/xep_0203/stanza.py
+++ b/sleekxmpp/plugins/xep_0203/stanza.py
@@ -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):