From 7c3e61950d902441dfb86de0cdebbc4ff38033a3 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 21 Sep 2014 18:51:06 +0200
Subject: Remove all deprecated alias in the core of slixmpp, and wherever they
 were used.

---
 slixmpp/stanza/error.py    | 10 ----------
 slixmpp/stanza/htmlim.py   |  7 -------
 slixmpp/stanza/iq.py       |  8 --------
 slixmpp/stanza/message.py  | 11 -----------
 slixmpp/stanza/nick.py     |  6 ------
 slixmpp/stanza/presence.py | 10 ----------
 slixmpp/stanza/roster.py   |  6 ------
 7 files changed, 58 deletions(-)

(limited to 'slixmpp/stanza')

diff --git a/slixmpp/stanza/error.py b/slixmpp/stanza/error.py
index efdcda0e..67f736c0 100644
--- a/slixmpp/stanza/error.py
+++ b/slixmpp/stanza/error.py
@@ -162,13 +162,3 @@ class Error(ElementBase):
 
     def del_redirect(self):
         self._del_sub('{%s}redirect' % self.condition_ns)
-
-
-# To comply with PEP8, method names now use underscores.
-# Deprecated method names are re-mapped for backwards compatibility.
-Error.getCondition = Error.get_condition
-Error.setCondition = Error.set_condition
-Error.delCondition = Error.del_condition
-Error.getText = Error.get_text
-Error.setText = Error.set_text
-Error.delText = Error.del_text
diff --git a/slixmpp/stanza/htmlim.py b/slixmpp/stanza/htmlim.py
index a2842a3b..a5a3e5f3 100644
--- a/slixmpp/stanza/htmlim.py
+++ b/slixmpp/stanza/htmlim.py
@@ -12,10 +12,3 @@ from slixmpp.plugins.xep_0071 import XHTML_IM as HTMLIM
 
 
 register_stanza_plugin(Message, HTMLIM)
-
-
-# To comply with PEP8, method names now use underscores.
-# Deprecated method names are re-mapped for backwards compatibility.
-HTMLIM.setBody = HTMLIM.set_body
-HTMLIM.getBody = HTMLIM.get_body
-HTMLIM.delBody = HTMLIM.del_body
diff --git a/slixmpp/stanza/iq.py b/slixmpp/stanza/iq.py
index d247fc0e..e2b3c1f9 100644
--- a/slixmpp/stanza/iq.py
+++ b/slixmpp/stanza/iq.py
@@ -246,11 +246,3 @@ class Iq(RootStanza):
         else:
             StanzaBase._set_stanza_values(self, values)
         return self
-
-
-# To comply with PEP8, method names now use underscores.
-# Deprecated method names are re-mapped for backwards compatibility.
-Iq.setPayload = Iq.set_payload
-Iq.getQuery = Iq.get_query
-Iq.setQuery = Iq.set_query
-Iq.delQuery = Iq.del_query
diff --git a/slixmpp/stanza/message.py b/slixmpp/stanza/message.py
index 9495a629..09e44ad8 100644
--- a/slixmpp/stanza/message.py
+++ b/slixmpp/stanza/message.py
@@ -186,14 +186,3 @@ class Message(RootStanza):
     def del_mucnick(self):
         """Dummy method to prevent deletion."""
         pass
-
-
-# To comply with PEP8, method names now use underscores.
-# Deprecated method names are re-mapped for backwards compatibility.
-Message.getType = Message.get_type
-Message.getMucroom = Message.get_mucroom
-Message.setMucroom = Message.set_mucroom
-Message.delMucroom = Message.del_mucroom
-Message.getMucnick = Message.get_mucnick
-Message.setMucnick = Message.set_mucnick
-Message.delMucnick = Message.del_mucnick
diff --git a/slixmpp/stanza/nick.py b/slixmpp/stanza/nick.py
index bc7bf5ed..3bb7d63d 100644
--- a/slixmpp/stanza/nick.py
+++ b/slixmpp/stanza/nick.py
@@ -15,9 +15,3 @@ from slixmpp.plugins.xep_0172 import UserNick as Nick
 
 register_stanza_plugin(Message, Nick)
 register_stanza_plugin(Presence, Nick)
-
-# To comply with PEP8, method names now use underscores.
-# Deprecated method names are re-mapped for backwards compatibility.
-Nick.setNick = Nick.set_nick
-Nick.getNick = Nick.get_nick
-Nick.delNick = Nick.del_nick
diff --git a/slixmpp/stanza/presence.py b/slixmpp/stanza/presence.py
index 3da20b7d..2c77a878 100644
--- a/slixmpp/stanza/presence.py
+++ b/slixmpp/stanza/presence.py
@@ -179,13 +179,3 @@ class Presence(RootStanza):
         elif self['type'] == 'subscribe':
             self['type'] = 'subscribed'
         return StanzaBase.reply(self, clear)
-
-
-# To comply with PEP8, method names now use underscores.
-# Deprecated method names are re-mapped for backwards compatibility.
-Presence.setShow = Presence.set_show
-Presence.getType = Presence.get_type
-Presence.setType = Presence.set_type
-Presence.delType = Presence.get_type
-Presence.getPriority = Presence.get_priority
-Presence.setPriority = Presence.set_priority
diff --git a/slixmpp/stanza/roster.py b/slixmpp/stanza/roster.py
index 0cf11429..c017c33f 100644
--- a/slixmpp/stanza/roster.py
+++ b/slixmpp/stanza/roster.py
@@ -150,9 +150,3 @@ class RosterItem(ElementBase):
 
 register_stanza_plugin(Iq, Roster)
 register_stanza_plugin(Roster, RosterItem, iterable=True)
-
-# To comply with PEP8, method names now use underscores.
-# Deprecated method names are re-mapped for backwards compatibility.
-Roster.setItems = Roster.set_items
-Roster.getItems = Roster.get_items
-Roster.delItems = Roster.del_items
-- 
cgit v1.2.3