github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-24 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove deprecation warnings

Browse source 
Remove all the deprecation warnings by using only boundjid.
And also fix a indentation error.
This commit is contained in:
Florent Le Coz 2010-10-17 03:09:40 +08:00 committed by Lance Stout
parent 2d18d905a5
commit 2755d732a4
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sleekxmpp/basexmpp.py
View file

@ -380,7 +380,7 @@ class BaseXMPP(XMLStream):
if pshow is not None: if pshow is not None:
presence['type'] = pshow presence['type'] = pshow
if pfrom is None: if pfrom is None:
presence['from'] = self.fulljid presence['from'] = self.boundjid.full
presence['priority'] = ppriority presence['priority'] = ppriority
presence['status'] = pstatus presence['status'] = pstatus
return presence return presence

14
sleekxmpp/clientxmpp.py
View file

@ -79,7 +79,7 @@ class ClientXMPP(BaseXMPP):
self.srv_support = SRV_SUPPORT self.srv_support = SRV_SUPPORT
self.stream_header = "<stream:stream to='%s' %s %s version='1.0'>" % ( self.stream_header = "<stream:stream to='%s' %s %s version='1.0'>" % (
self.server, self.boundjid.host,
"xmlns:stream='%s'" % self.stream_ns, "xmlns:stream='%s'" % self.stream_ns,
"xmlns='%s'" % self.default_ns) "xmlns='%s'" % self.default_ns)
self.stream_footer = "</stream:stream>" self.stream_footer = "</stream:stream>"
@ -306,10 +306,10 @@ class ClientXMPP(BaseXMPP):
self.features.append("sasl:%s" % sasl_mech.text) self.features.append("sasl:%s" % sasl_mech.text)
if 'sasl:PLAIN' in self.features and self.boundjid.user: if 'sasl:PLAIN' in self.features and self.boundjid.user:
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
user = bytes(self.username) user = bytes(self.boundjid.user)
password = bytes(self.password) password = bytes(self.password)
else: else:
user = bytes(self.username, 'utf-8') user = bytes(self.boundjid.user, 'utf-8')
password = bytes(self.password, 'utf-8') password = bytes(self.password, 'utf-8')
auth = base64.b64encode(b'\x00' + user + \ auth = base64.b64encode(b'\x00' + user + \
@ -354,12 +354,12 @@ class ClientXMPP(BaseXMPP):
Arguments: Arguments:
xml -- The bind feature element. xml -- The bind feature element.
""" """
logging.debug("Requesting resource: %s" % self.resource) logging.debug("Requesting resource: %s" % self.boundjid.resource)
xml.clear() xml.clear()
iq = self.Iq(stype='set') iq = self.Iq(stype='set')
if self.resource: if self.boundjid.resource:
res = ET.Element('resource') res = ET.Element('resource')
res.text = self.resource res.text = self.boundjid.resource
xml.append(res) xml.append(res)
iq.append(xml) iq.append(xml)
response = iq.send() response = iq.send()
@ -368,7 +368,7 @@ class ClientXMPP(BaseXMPP):
self.set_jid(response.xml.find('{%s}bind/{%s}jid' % (bind_ns, self.set_jid(response.xml.find('{%s}bind/{%s}jid' % (bind_ns,
bind_ns)).text) bind_ns)).text)
self.bound = True 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' session_ns = 'urn:ietf:params:xml:ns:xmpp-session'
if "{%s}session" % session_ns not in self.features or self.bindfail: if "{%s}session" % session_ns not in self.features or self.bindfail:
logging.debug("Established Session") logging.debug("Established Session")

2
sleekxmpp/xmlstream/jid.py
View file

@ -102,7 +102,7 @@ class JID(object):
d = value d = value
object.__setattr__(self, "_domain", d) object.__setattr__(self, "_domain", d)
else: else:
self.reset(value) self.reset(value)
elif name == 'bare': elif name == 'bare':
if '@' in value: if '@' in value:
u, d = value.split('@', 1) u, d = value.split('@', 1)