Revert or edit most previous XEP plugin changes

In a single commit, because it isn’t that interesting to detail each
change.

List of reverts:

Revert "XEP-0030: allow get_info and get_items to return a coroutine"
    This reverts commit 506ca6991790cffb90c5b6e3b765237ccc136e1a.

Revert "XEP-0060: wrap all iq-sending functions with coroutine_wrapper"
    This reverts commit e85fa4203e0ee7108d8d37f73913c21628e3d6fc.

Revert "XEP-0163: wrap publish() with coroutine_wrapper"
    This reverts commit 69da1c1d7cf7a1c0dbbeeb83f528b4e5f5b5be0c.

Revert "XEP-0084: wrap functions with coroutine_wrapper"
    This reverts commit ea5615f236bd80fb4217398977833ca790cbef71.

Partially revert 3d243f7 (XEP-0054) - continue wrapping functions but with future_wrapper

Partially revert 115fe95 (xep-0153) - use callbacks rather than coroutine callbacks, and propagate iqtimeouts in set_avatar.

Revert "XEP-0049: wrap functions with coroutine_wrapper"
    This reverts commit e68135f59f9a224688679eb91e8063041d6f000b.

Revert "XEP-0077: wrap functions with coroutine_wrapper"
    This reverts commit 1e4944d47e8296fdaa792a8b3fc87ea99acc217c.

Partially revert cd7ff685 (XEP-0199) - remove the iq.send wrapping but keep ping() as a coroutine

Revert "XEP-0257: wrap functions with coroutine_wrapper"
    This reverts commit 4da870fd191697d010e677eee32ef86439967353.

Revert "XEP-0092: wrap get_version() with coroutine_wrapper"
    This reverts commit 6e35948276c36ea2696f0de64dc179a1073ee3a6.

Revert "XEP-0191: wrap functions with coroutine_wrapper"
    This reverts commit 6e8235544cc1bdefea75a8d93e5e3a48a13552ba.

Revert "XEP-0280: wrap functions with coroutine_wrapper"
    This reverts commit f795ac02e322445be13077463638924d1f22d313.

Revert "XEP-0012: wrap get_last_activity() with coroutine_wrapper"
    This reverts commit 2ee05d9616d2959d19a7a87d21c58e6aae1db56e.

Revert "XEP-0202: wrap get_entity_time() with coroutine_wrapper"
    This reverts commit 6fb3ecd414f24374f17811d7ad2fd01e4924e311.

Revert "XEP-0231: wrap get_bob() with coroutine_wrapper"
    This reverts commit 17464b10a42d9b3c4daba763e06e53c429478abd.

Revert "XEP-0258: wrap get_catalog() with coroutine_wrapper"
    This reverts commit 18a4978456a33e6ea38de1e07b1aa43bcc10d45f.

Revert "XEP-0050: wrap send_command() and get_commands() with coroutine_wrapper"
    This reverts commit e034b31d6bc34f43578456e9c6527bc56dff78e3.

Revert "XEP-0279: wrap check_ip() with coroutine_wrapper"
    This reverts commit e112e864756f1222a044ee28e3c13c5925618b0c.

1 files changed, 8 insertions, 13 deletions

diff --git a/slixmpp/plugins/xep_0257/client_cert_management.py b/slixmpp/plugins/xep_0257/client_cert_management.py
index 552d5e9f..729197e0 100644
--- a/slixmpp/plugins/xep_0257/client_cert_management.py
+++ b/slixmpp/plugins/xep_0257/client_cert_management.py
@@ -10,7 +10,6 @@ import logging
 
 from slixmpp import Iq
 from slixmpp.plugins import BasePlugin
-from slixmpp import coroutine_wrapper
 from slixmpp.xmlstream import register_stanza_plugin
 from slixmpp.plugins.xep_0257 import stanza, Certs
 from slixmpp.plugins.xep_0257 import AppendCert, DisableCert, RevokeCert
@@ -32,39 +31,35 @@ class XEP_0257(BasePlugin):
         register_stanza_plugin(Iq, DisableCert)
         register_stanza_plugin(Iq, RevokeCert)
 
-    @coroutine_wrapper
-    def get_certs(self, ifrom=None, timeout=None, callback=None, coroutine=False):
+    def get_certs(self, ifrom=None, timeout=None, callback=None):
         iq = self.xmpp.Iq()
         iq['type'] = 'get'
         iq['from'] = ifrom
         iq.enable('sasl_certs')
-        return iq.send(timeout=timeout, callback=callback, coroutine=coroutine)
+        return iq.send(timeout=timeout, callback=callback)
 
-    @coroutine_wrapper
     def add_cert(self, name, cert, allow_management=True, ifrom=None,
-                       timeout=None, callback=None, coroutine=False):
+                       timeout=None, callback=None):
         iq = self.xmpp.Iq()
         iq['type'] = 'set'
         iq['from'] = ifrom
         iq['sasl_cert_append']['name'] = name
         iq['sasl_cert_append']['x509cert'] = cert
         iq['sasl_cert_append']['cert_management'] = allow_management
-        return iq.send(timeout=timeout, callback=callback, coroutine=coroutine)
+        return iq.send(timeout=timeout, callback=callback)
 
-    @coroutine_wrapper
-    def disable_cert(self, name, ifrom=None, coroutine=False,
+    def disable_cert(self, name, ifrom=None,
                            timeout=None, callback=None):
         iq = self.xmpp.Iq()
         iq['type'] = 'set'
         iq['from'] = ifrom
         iq['sasl_cert_disable']['name'] = name
-        return iq.send(timeout=timeout, callback=callback, coroutine=coroutine)
+        return iq.send(timeout=timeout, callback=callback)
 
-    @coroutine_wrapper
-    def revoke_cert(self, name, ifrom=None, coroutine=False,
+    def revoke_cert(self, name, ifrom=None,
                            timeout=None, callback=None):
         iq = self.xmpp.Iq()
         iq['type'] = 'set'
         iq['from'] = ifrom
         iq['sasl_cert_revoke']['name'] = name
-        return iq.send(timeout=timeout, callback=callback, coroutine=coroutine)
+        return iq.send(timeout=timeout, callback=callback)