summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorThom Nichols <tmnichols@gmail.com>2010-05-18 16:11:27 -0400
committerThom Nichols <tmnichols@gmail.com>2010-05-18 16:11:27 -0400
commit3e83b16a586b34dd686a4aeaea77c50a92f54b51 (patch)
tree7ec6699cc4f04411aa710efdf7d6043826929764 /sleekxmpp/basexmpp.py
parentde4d611d3053f2c4fb5029ba5214996cf3821e02 (diff)
parent8e95ae2948228ddc6d1b32eca2e64b847c756a71 (diff)
downloadslixmpp-3e83b16a586b34dd686a4aeaea77c50a92f54b51.tar.gz
slixmpp-3e83b16a586b34dd686a4aeaea77c50a92f54b51.tar.bz2
slixmpp-3e83b16a586b34dd686a4aeaea77c50a92f54b51.tar.xz
slixmpp-3e83b16a586b34dd686a4aeaea77c50a92f54b51.zip
Merge branch 'hacks' of github.com:tomstrummer/SleekXMPP
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 13fe2100..b011f7ba 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -49,7 +49,7 @@ class basexmpp(object):
self.resource = ''
self.jid = ''
self.username = ''
- self.server = ''
+ self.domain = ''
self.plugin = {}
self.auto_authorize = True
self.auto_subscribe = True
@@ -84,7 +84,7 @@ class basexmpp(object):
self.resource = self.getjidresource(jid)
self.jid = self.getjidbare(jid)
self.username = jid.split('@', 1)[0]
- self.server = jid.split('@',1)[-1].split('/', 1)[0]
+ self.domain = jid.split('@',1)[-1].split('/', 1)[0]
def registerPlugin(self, plugin, pconfig = {}):
"""Register a plugin not in plugins.__init__.__all__ but in the plugins