From 4916a12b6f2515b22b504c650bd97dd4c30c4471 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Wed, 23 Mar 2011 22:59:21 -0400
Subject: [PATCH] Tidy up the examples.

---
 examples/disco_browser.py |  2 +-
 examples/echo_client.py   | 20 +++++++++++---------
 examples/ping.py          | 11 +++++++----
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/examples/disco_browser.py b/examples/disco_browser.py
index 0d746083..b2b96f95 100755
--- a/examples/disco_browser.py
+++ b/examples/disco_browser.py
@@ -113,7 +113,7 @@ class Disco(sleekxmpp.ClientXMPP):
         if self.get in self.identity_types:
             print('Identities:')
             for identity in info['disco_info']['identities']:
-                print('  - ', identity)
+                print('  - %s' % str(identity))
 
         if self.get in self.feature_types:
             print('Features:')
diff --git a/examples/echo_client.py b/examples/echo_client.py
index 099f8eea..dadf3b4e 100755
--- a/examples/echo_client.py
+++ b/examples/echo_client.py
@@ -12,6 +12,7 @@
 import sys
 import logging
 import time
+import getpass
 from optparse import OptionParser
 
 import sleekxmpp
@@ -60,8 +61,8 @@ class EchoBot(sleekxmpp.ClientXMPP):
                      event does not provide any additional
                      data.
         """
-        self.getRoster()
-        self.sendPresence()
+        self.send_presence()
+        self.get_roster()
 
     def message(self, msg):
         """
@@ -105,18 +106,19 @@ if __name__ == '__main__':
     logging.basicConfig(level=opts.loglevel,
                         format='%(levelname)-8s %(message)s')
 
-    if None in [opts.jid, opts.password]:
-        optp.print_help()
-        sys.exit(1)
+    if opts.jid is None:
+        opts.jid = raw_input("Username: ")
+    if opts.password is None:
+        opts.password = getpass.getpass("Password: ")
 
     # Setup the EchoBot and register plugins. Note that while plugins may
     # have interdependencies, the order in which you register them does
     # not matter.
     xmpp = EchoBot(opts.jid, opts.password)
-    xmpp.registerPlugin('xep_0030') # Service Discovery
-    xmpp.registerPlugin('xep_0004') # Data Forms
-    xmpp.registerPlugin('xep_0060') # PubSub
-    xmpp.registerPlugin('xep_0199') # XMPP Ping
+    xmpp.register_plugin('xep_0030') # Service Discovery
+    xmpp.register_plugin('xep_0004') # Data Forms
+    xmpp.register_plugin('xep_0060') # PubSub
+    xmpp.register_plugin('xep_0199') # XMPP Ping
 
     # If you are working with an OpenFire server, you may need
     # to adjust the SSL version used:
diff --git a/examples/ping.py b/examples/ping.py
index 70066e3c..ae030c0f 100755
--- a/examples/ping.py
+++ b/examples/ping.py
@@ -12,6 +12,7 @@
 import sys
 import logging
 import time
+import getpass
 from optparse import OptionParser
 
 import sleekxmpp
@@ -58,7 +59,8 @@ class PingTest(sleekxmpp.ClientXMPP):
                      event does not provide any additional
                      data.
         """
-        self.sendPresence()
+        self.send_presence()
+        self.get_roster()
         result = self['xep_0199'].send_ping(self.pingjid,
                                             timeout=10,
                                             errorfalse=True)
@@ -102,9 +104,10 @@ if __name__ == '__main__':
     logging.basicConfig(level=opts.loglevel,
                         format='%(levelname)-8s %(message)s')
 
-    if None in [opts.jid, opts.password]:
-        optp.print_help()
-        sys.exit(1)
+    if opts.jid is None:
+        opts.jid = raw_input("Username: ")
+    if opts.password is None:
+        opts.password = getpass.getpass("Password: ")
 
     # Setup the PingTest and register plugins. Note that while plugins may
     # have interdependencies, the order in which you register them does