summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-14 14:18:40 -0700
committerLance Stout <lancestout@gmail.com>2011-06-14 14:18:40 -0700
commit8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2 (patch)
tree57825ebbe69d844e2caec9a961f98ed841fd02b1 /sleekxmpp/basexmpp.py
parent6d59f55fd45a3fa4ec27b45197a95a5aa308f3d2 (diff)
parentdd41a85efcd85bb3a4eb81187041106c65c6aa2d (diff)
downloadslixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.gz
slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.bz2
slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.xz
slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.zip
Merge branch 'develop' into exceptions
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 8347bfe0..3992a4f9 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -614,7 +614,7 @@ class BaseXMPP(XMLStream):
'in_roster': False}
# Alias to simplify some references.
- connections = self.roster[jid]['presence']
+ connections = self.roster[jid].get('presence', {})
# Determine if the user has just come online.
if not resource in connections: