diff options
| author | Florent Le Coz <louiz@louiz.org> | 2010-10-17 03:09:40 +0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2010-10-17 08:55:30 +0800 |
| commit | 2755d732a4e2843b4a685ec0ef57ee0f7c0f685f (patch) | |
| tree | ad202db838b9f64147ee1ec5ebddd2efbf85cb6a | |
| parent | 2d18d905a537587ee9685877ae2c108511e57d91 (diff) | |
| download | slixmpp-2755d732a4e2843b4a685ec0ef57ee0f7c0f685f.tar.gz slixmpp-2755d732a4e2843b4a685ec0ef57ee0f7c0f685f.tar.bz2 slixmpp-2755d732a4e2843b4a685ec0ef57ee0f7c0f685f.tar.xz slixmpp-2755d732a4e2843b4a685ec0ef57ee0f7c0f685f.zip | |
Remove deprecation warnings
Remove all the deprecation warnings by using only boundjid.
And also fix a indentation error.
| -rw-r--r-- | sleekxmpp/basexmpp.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/clientxmpp.py | 14 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/jid.py | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 2b4df809..c022f838 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -380,7 +380,7 @@ class BaseXMPP(XMLStream): if pshow is not None: presence['type'] = pshow if pfrom is None: - presence['from'] = self.fulljid + presence['from'] = self.boundjid.full presence['priority'] = ppriority presence['status'] = pstatus return presence diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index 9655ebab..2bbd138c 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -79,7 +79,7 @@ class ClientXMPP(BaseXMPP): self.srv_support = SRV_SUPPORT self.stream_header = "<stream:stream to='%s' %s %s version='1.0'>" % ( - self.server, + self.boundjid.host, "xmlns:stream='%s'" % self.stream_ns, "xmlns='%s'" % self.default_ns) self.stream_footer = "</stream:stream>" @@ -306,10 +306,10 @@ class ClientXMPP(BaseXMPP): self.features.append("sasl:%s" % sasl_mech.text) if 'sasl:PLAIN' in self.features and self.boundjid.user: if sys.version_info < (3, 0): - user = bytes(self.username) + user = bytes(self.boundjid.user) password = bytes(self.password) else: - user = bytes(self.username, 'utf-8') + user = bytes(self.boundjid.user, 'utf-8') password = bytes(self.password, 'utf-8') auth = base64.b64encode(b'\x00' + user + \ @@ -354,12 +354,12 @@ class ClientXMPP(BaseXMPP): Arguments: xml -- The bind feature element. """ - logging.debug("Requesting resource: %s" % self.resource) + logging.debug("Requesting resource: %s" % self.boundjid.resource) xml.clear() iq = self.Iq(stype='set') - if self.resource: + if self.boundjid.resource: res = ET.Element('resource') - res.text = self.resource + res.text = self.boundjid.resource xml.append(res) iq.append(xml) response = iq.send() @@ -368,7 +368,7 @@ class ClientXMPP(BaseXMPP): self.set_jid(response.xml.find('{%s}bind/{%s}jid' % (bind_ns, bind_ns)).text) self.bound = True - logging.info("Node set to: %s" % self.fulljid) + logging.info("Node set to: %s" % self.boundjid.fulljid) session_ns = 'urn:ietf:params:xml:ns:xmpp-session' if "{%s}session" % session_ns not in self.features or self.bindfail: logging.debug("Established Session") diff --git a/sleekxmpp/xmlstream/jid.py b/sleekxmpp/xmlstream/jid.py index aa17c7bc..7362814e 100644 --- a/sleekxmpp/xmlstream/jid.py +++ b/sleekxmpp/xmlstream/jid.py @@ -102,7 +102,7 @@ class JID(object): d = value object.__setattr__(self, "_domain", d) else: - self.reset(value) + self.reset(value) elif name == 'bare': if '@' in value: u, d = value.split('@', 1) |