diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:26:23 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:26:23 -0500 |
| commit | d5b3a5282763e4f74816ff392bd8cd47dd9f7a95 (patch) | |
| tree | 10b421c0cf9cf47997162485f35dabdccfffab69 /sleekxmpp/clientxmpp.py | |
| parent | 1a270dc05cc368000f3545975befa0589031b684 (diff) | |
| parent | d709f8db657aa1d1314082d842dd29e2546739c4 (diff) | |
| download | slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.gz slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.bz2 slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.xz slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.zip | |
Merge branch 'develop' into stream_features
Conflicts:
sleekxmpp/xmlstream/stanzabase.py
Diffstat (limited to 'sleekxmpp/clientxmpp.py')
| -rw-r--r-- | sleekxmpp/clientxmpp.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index e05f8e7b..85a77d7c 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -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 |