Merge branch 'muc-update' into 'master'

XEP-0045 examples: remove wait arg to join_muc calls

See merge request poezio/slixmpp!66

2 files changed, 4 insertions, 5 deletions

diff --git a/docs/getting_started/muc.rst b/docs/getting_started/muc.rst
index 653175eb..0b5cd1f8 100644
--- a/docs/getting_started/muc.rst
+++ b/docs/getting_started/muc.rst
@@ -60,12 +60,11 @@ has been established:
 
 .. code-block:: python
 
-    def start(self, event):
-        self.get_roster()
+    async def start(self, event):
+        await self.get_roster()
         self.send_presence()
         self.plugin['xep_0045'].join_muc(self.room,
-                                         self.nick,
-                                         wait=True)
+                                         self.nick)
 
 Note that as in :ref:`echobot`, we need to include send an initial presence and request
 the roster. Next, we want to join the group chat, so we call the
diff --git a/examples/muc.py b/examples/muc.py
index e3433b8f..62e8e898 100755
--- a/examples/muc.py
+++ b/examples/muc.py
@@ -71,7 +71,7 @@ class MUCBot(slixmpp.ClientXMPP):
                                          self.nick,
                                          # If a room password is needed, use:
                                          # password=the_room_password,
-                                         wait=True)
+                                         )
 
     def muc_message(self, msg):
         """