From 2a8082407656bf78a487afcf20017b10ca6475cc Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Tue, 23 Aug 2011 14:14:21 -0700
Subject: [PATCH] Remove extra debugging code that made it into a commit.

---
 examples/adhoc_provider.py | 19 ++-----------------
 examples/echo_client.py    |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/examples/adhoc_provider.py b/examples/adhoc_provider.py
index 5fa26334..0a7905b8 100755
--- a/examples/adhoc_provider.py
+++ b/examples/adhoc_provider.py
@@ -85,17 +85,6 @@ class CommandBot(sleekxmpp.ClientXMPP):
         form.addField(var='greeting',
                       ftype='text-single',
                       label='Your greeting')
-        form.addField(var='recipient',
-                      ftype='jid-single',
-                      label='Who to greet')
-        form.addField(var='message',
-                      ftype='text-multi',
-                      label='Your message')
-        form.addField(var='demobool',
-                      ftype='boolean',
-                      label='Test booleans',
-                      desc='Test default values too',
-                      value=True)
 
         session['payload'] = form
         session['next'] = self._handle_command_complete
@@ -137,13 +126,9 @@ class CommandBot(sleekxmpp.ClientXMPP):
         form = payload
 
         greeting = form['values']['greeting']
-        recipient = form['values']['recipient']
-        message = '\n'.join(form['values']['message'])
 
-        if recipient is None:
-            recipient = session['from']
-        self.send_message(mto=recipient,
-                          mbody="%s, %s!\n%s" % (greeting, recipient, message),
+        self.send_message(mto=session['from'],
+                          mbody="%s, World!" % greeting,
                           mtype='chat')
 
         # Having no return statement is the same as unsetting the 'payload'
diff --git a/examples/echo_client.py b/examples/echo_client.py
index 122b20f0..7e882a4a 100755
--- a/examples/echo_client.py
+++ b/examples/echo_client.py
@@ -36,7 +36,7 @@ class EchoBot(sleekxmpp.ClientXMPP):
     """
 
     def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password, plugin_config={'feature_mechanisms': {'use_mech': 'PLAIN'}})
+        sleekxmpp.ClientXMPP.__init__(self, jid, password)
 
         # The session_start event will be triggered when
         # the bot establishes its connection with the server