jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into stream_features

Browse Source 
Conflicts:
	sleekxmpp/xmlstream/stanzabase.py
This commit is contained in:
Lance Stout
2011-02-14 16:26:23 -05:00
parent 1a270dc05c d709f8db65
commit d5b3a52827
41 changed files with 2050 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sleekxmpp/clientxmpp.py
View File

@@ -70,13 +70,6 @@ class ClientXMPP(BaseXMPP):
"""
BaseXMPP.__init__(self, 'jabber:client')
# To comply with PEP8, method names now use underscores.
# Deprecated method names are re-mapped for backwards compatibility.
self.updateRoster = self.update_roster
self.delRosterItem = self.del_roster_item
self.getRoster = self.get_roster
self.registerFeature = self.register_feature
self.set_jid(jid)
self.password = password
self.escape_quotes = escape_quotes
@@ -504,3 +497,11 @@ class ClientXMPP(BaseXMPP):
iq.reply()
iq.enable('roster')
iq.send()
# To comply with PEP8, method names now use underscores.
# Deprecated method names are re-mapped for backwards compatibility.
ClientXMPP.updateRoster = ClientXMPP.update_roster
ClientXMPP.delRosterItem = ClientXMPP.del_roster_item
ClientXMPP.getRoster = ClientXMPP.get_roster
ClientXMPP.registerFeature = ClientXMPP.register_feature