Various XEPs: Remove deprecated aliases.

2016-09-20 15:58:29 +09:00
parent d099e353a4
commit 7cd1cf32ae
38 changed files with 34 additions and 158 deletions
--- a/slixmpp/plugins/xep_0004/init.py
+++ b/slixmpp/plugins/xep_0004/init.py
@@ -14,9 +14,3 @@ from slixmpp.plugins.xep_0004.dataforms import XEP_0004


 register_plugin(XEP_0004)
-
-
-# Retain some backwards compatibility
-xep_0004 = XEP_0004
-xep_0004.makeForm = xep_0004.make_form
-xep_0004.buildForm = xep_0004.build_form
--- a/slixmpp/plugins/xep_0009/init.py
+++ b/slixmpp/plugins/xep_0009/init.py
@@ -14,7 +14,3 @@ from slixmpp.plugins.xep_0009.stanza import RPCQuery, MethodCall, MethodResponse


 register_plugin(XEP_0009)
-
-
-# Retain some backwards compatibility
-xep_0009 = XEP_0009
--- a/slixmpp/plugins/xep_0012/init.py
+++ b/slixmpp/plugins/xep_0012/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0012.last_activity import XEP_0012


 register_plugin(XEP_0012)
-
-
-# Retain some backwards compatibility
-xep_0004 = XEP_0012
--- a/slixmpp/plugins/xep_0030/init.py
+++ b/slixmpp/plugins/xep_0030/init.py
@@ -15,8 +15,3 @@ from slixmpp.plugins.xep_0030.disco import XEP_0030


 register_plugin(XEP_0030)
-
-# Retain some backwards compatibility
-xep_0030 = XEP_0030
-XEP_0030.getInfo = XEP_0030.get_info
-XEP_0030.make_static = XEP_0030.restore_defaults
--- a/slixmpp/plugins/xep_0033/init.py
+++ b/slixmpp/plugins/xep_0033/init.py
@@ -14,7 +14,3 @@ from slixmpp.plugins.xep_0033.addresses import XEP_0033


 register_plugin(XEP_0033)
-
-# Retain some backwards compatibility
-xep_0033 = XEP_0033
-Addresses.addAddress = Addresses.add_address
--- a/slixmpp/plugins/xep_0033/stanza.py
+++ b/slixmpp/plugins/xep_0033/stanza.py
@@ -118,14 +118,8 @@ for atype in ('all', 'bcc', 'cc', 'noreply', 'replyroom', 'replyto', 'to'):
    setattr(Addresses, "del_%s" % atype, del_multi)

    # To retain backwards compatibility:
-    setattr(Addresses, "get%s" % atype.title(), get_multi)
-    setattr(Addresses, "set%s" % atype.title(), set_multi)
-    setattr(Addresses, "del%s" % atype.title(), del_multi)
    if atype == 'all':
        Addresses.interfaces.add('addresses')
-        setattr(Addresses, "getAddresses", get_multi)
-        setattr(Addresses, "setAddresses", set_multi)
-        setattr(Addresses, "delAddresses", del_multi)


 register_stanza_plugin(Addresses, Address, iterable=True)
--- a/slixmpp/plugins/xep_0045.py
+++ b/slixmpp/plugins/xep_0045.py
@@ -360,7 +360,7 @@ class XEP_0045(BasePlugin):
        form = result.xml.find('{http://jabber.org/protocol/muc#owner}query/{jabber:x:data}x')
        if form is None:
            raise ValueError
-        return self.xmpp.plugin['xep_0004'].buildForm(form)
+        return self.xmpp.plugin['xep_0004'].build_form(form)

    def cancelConfig(self, room, ifrom=None):
        query = ET.Element('{http://jabber.org/protocol/muc#owner}query')
--- a/slixmpp/plugins/xep_0047/init.py
+++ b/slixmpp/plugins/xep_0047/init.py
@@ -15,7 +15,3 @@ from slixmpp.plugins.xep_0047.ibb import XEP_0047


 register_plugin(XEP_0047)
-
-
-# Retain some backwards compatibility
-xep_0047 = XEP_0047
--- a/slixmpp/plugins/xep_0050/init.py
+++ b/slixmpp/plugins/xep_0050/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0050.adhoc import XEP_0050


 register_plugin(XEP_0050)
-
-
-# Retain some backwards compatibility
-xep_0050 = XEP_0050
--- a/slixmpp/plugins/xep_0059/init.py
+++ b/slixmpp/plugins/xep_0059/init.py
@@ -13,6 +13,3 @@ from slixmpp.plugins.xep_0059.rsm import ResultIterator, XEP_0059


 register_plugin(XEP_0059)
-
-# Retain some backwards compatibility
-xep_0059 = XEP_0059
--- a/slixmpp/plugins/xep_0060/init.py
+++ b/slixmpp/plugins/xep_0060/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0060 import stanza


 register_plugin(XEP_0060)
-
-
-# Retain some backwards compatibility
-xep_0060 = XEP_0060
--- a/slixmpp/plugins/xep_0066/init.py
+++ b/slixmpp/plugins/xep_0066/init.py
@@ -14,7 +14,3 @@ from slixmpp.plugins.xep_0066.oob import XEP_0066


 register_plugin(XEP_0066)
-
-
-# Retain some backwards compatibility
-xep_0066 = XEP_0066
--- a/slixmpp/plugins/xep_0077/init.py
+++ b/slixmpp/plugins/xep_0077/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0077.register import XEP_0077


 register_plugin(XEP_0077)
-
-
-# Retain some backwards compatibility
-xep_0077 = XEP_0077
--- a/slixmpp/plugins/xep_0078/init.py
+++ b/slixmpp/plugins/xep_0078/init.py
@@ -14,7 +14,3 @@ from slixmpp.plugins.xep_0078.legacyauth import XEP_0078


 register_plugin(XEP_0078)
-
-
-# Retain some backwards compatibility
-xep_0078 = XEP_0078
--- a/slixmpp/plugins/xep_0085/init.py
+++ b/slixmpp/plugins/xep_0085/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0085.chat_states import XEP_0085


 register_plugin(XEP_0085)
-
-
-# Retain some backwards compatibility
-xep_0085 = XEP_0085
--- a/slixmpp/plugins/xep_0086/init.py
+++ b/slixmpp/plugins/xep_0086/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0086.legacy_error import XEP_0086


 register_plugin(XEP_0086)
-
-
-# Retain some backwards compatibility
-xep_0086 = XEP_0086
--- a/slixmpp/plugins/xep_0092/init.py
+++ b/slixmpp/plugins/xep_0092/init.py
@@ -14,7 +14,3 @@ from slixmpp.plugins.xep_0092.version import XEP_0092


 register_plugin(XEP_0092)
-
-
-# Retain some backwards compatibility
-xep_0092 = XEP_0092
--- a/slixmpp/plugins/xep_0115/init.py
+++ b/slixmpp/plugins/xep_0115/init.py
@@ -14,7 +14,3 @@ from slixmpp.plugins.xep_0115.caps import XEP_0115


 register_plugin(XEP_0115)
-
-
-# Retain some backwards compatibility
-xep_0115 = XEP_0115
--- a/slixmpp/plugins/xep_0122/init.py
+++ b/slixmpp/plugins/xep_0122/init.py
@@ -5,7 +5,3 @@ from slixmpp.plugins.xep_0122.data_validation import XEP_0122


 register_plugin(XEP_0122)
-
-
-# Retain some backwards compatibility
-xep_0122 = XEP_0122
--- a/slixmpp/plugins/xep_0128/init.py
+++ b/slixmpp/plugins/xep_0128/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0128.extended_disco import XEP_0128


 register_plugin(XEP_0128)
-
-
-# Retain some backwards compatibility
-xep_0128 = XEP_0128
--- a/slixmpp/plugins/xep_0184/init.py
+++ b/slixmpp/plugins/xep_0184/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0184.receipt import XEP_0184


 register_plugin(XEP_0184)
-
-
-# Retain some backwards compatibility
-xep_0184 = XEP_0184
--- a/slixmpp/plugins/xep_0199/init.py
+++ b/slixmpp/plugins/xep_0199/init.py
@@ -13,8 +13,3 @@ from slixmpp.plugins.xep_0199.ping import XEP_0199


 register_plugin(XEP_0199)
-
-
-# Backwards compatibility for names
-xep_0199 = XEP_0199
-xep_0199.sendPing = xep_0199.send_ping
--- a/slixmpp/plugins/xep_0202/init.py
+++ b/slixmpp/plugins/xep_0202/init.py
@@ -14,7 +14,3 @@ from slixmpp.plugins.xep_0202.time import XEP_0202


 register_plugin(XEP_0202)
-
-
-# Retain some backwards compatibility
-xep_0202 = XEP_0202
--- a/slixmpp/plugins/xep_0203/init.py
+++ b/slixmpp/plugins/xep_0203/init.py
@@ -14,6 +14,3 @@ from slixmpp.plugins.xep_0203.delay import XEP_0203


 register_plugin(XEP_0203)
-
-# Retain some backwards compatibility
-xep_0203 = XEP_0203
--- a/slixmpp/plugins/xep_0224/init.py
+++ b/slixmpp/plugins/xep_0224/init.py
@@ -14,7 +14,3 @@ from slixmpp.plugins.xep_0224.attention import XEP_0224


 register_plugin(XEP_0224)
-
-
-# Retain some backwards compatibility
-xep_0224 = XEP_0224
--- a/slixmpp/plugins/xep_0249/init.py
+++ b/slixmpp/plugins/xep_0249/init.py
@@ -13,7 +13,3 @@ from slixmpp.plugins.xep_0249.invite import XEP_0249


 register_plugin(XEP_0249)
-
-
-# Retain some backwards compatibility
-xep_0249 = XEP_0249