aboutsummaryrefslogtreecommitdiffstats
path: root/examples/proxy_echo_client.py
diff options
context:
space:
mode:
Diffstat (limited to 'examples/proxy_echo_client.py')
-rwxr-xr-xexamples/proxy_echo_client.py85
1 files changed, 40 insertions, 45 deletions
diff --git a/examples/proxy_echo_client.py b/examples/proxy_echo_client.py
index 34ed98a..b149de3 100755
--- a/examples/proxy_echo_client.py
+++ b/examples/proxy_echo_client.py
@@ -11,7 +11,7 @@
import logging
from getpass import getpass
-from optparse import OptionParser
+from argparse import ArgumentParser
import slixmpp
@@ -71,58 +71,53 @@ class EchoBot(slixmpp.ClientXMPP):
if __name__ == '__main__':
# Setup the command line arguments.
- optp = OptionParser()
+ parser = ArgumentParser()
# Output verbosity options.
- optp.add_option('-q', '--quiet', help='set logging to ERROR',
- action='store_const', dest='loglevel',
- const=logging.ERROR, default=logging.INFO)
- optp.add_option('-d', '--debug', help='set logging to DEBUG',
- action='store_const', dest='loglevel',
- const=logging.DEBUG, default=logging.INFO)
- optp.add_option('-v', '--verbose', help='set logging to COMM',
- action='store_const', dest='loglevel',
- const=5, default=logging.INFO)
+ parser.add_argument("-q", "--quiet", help="set logging to ERROR",
+ action="store_const", dest="loglevel",
+ const=logging.ERROR, default=logging.INFO)
+ parser.add_argument("-d", "--debug", help="set logging to DEBUG",
+ action="store_const", dest="loglevel",
+ const=logging.DEBUG, default=logging.INFO)
# JID and password options.
- optp.add_option("-j", "--jid", dest="jid",
- help="JID to use")
- optp.add_option("-p", "--password", dest="password",
- help="password to use")
- optp.add_option("--phost", dest="proxy_host",
- help="Proxy hostname")
- optp.add_option("--pport", dest="proxy_port",
- help="Proxy port")
- optp.add_option("--puser", dest="proxy_user",
- help="Proxy username")
- optp.add_option("--ppass", dest="proxy_pass",
- help="Proxy password")
-
-
-
- opts, args = optp.parse_args()
+ parser.add_argument("-j", "--jid", dest="jid",
+ help="JID to use")
+ parser.add_argument("-p", "--password", dest="password",
+ help="password to use")
+ parser.add_argument("--phost", dest="proxy_host",
+ help="Proxy hostname")
+ parser.add_argument("--pport", dest="proxy_port",
+ help="Proxy port")
+ parser.add_argument("--puser", dest="proxy_user",
+ help="Proxy username")
+ parser.add_argument("--ppass", dest="proxy_pass",
+ help="Proxy password")
+
+ args = parser.parse_args()
# Setup logging.
- logging.basicConfig(level=opts.loglevel,
+ logging.basicConfig(level=args.loglevel,
format='%(levelname)-8s %(message)s')
- if opts.jid is None:
- opts.jid = input("Username: ")
- if opts.password is None:
- opts.password = getpass("Password: ")
- if opts.proxy_host is None:
- opts.proxy_host = input("Proxy host: ")
- if opts.proxy_port is None:
- opts.proxy_port = input("Proxy port: ")
- if opts.proxy_user is None:
- opts.proxy_user = input("Proxy username: ")
- if opts.proxy_pass is None and opts.proxy_user:
- opts.proxy_pass = getpass("Proxy password: ")
+ if args.jid is None:
+ args.jid = input("Username: ")
+ if args.password is None:
+ args.password = getpass("Password: ")
+ if args.proxy_host is None:
+ args.proxy_host = input("Proxy host: ")
+ if args.proxy_port is None:
+ args.proxy_port = input("Proxy port: ")
+ if args.proxy_user is None:
+ args.proxy_user = input("Proxy username: ")
+ if args.proxy_pass is None and args.proxy_user:
+ args.proxy_pass = getpass("Proxy 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 = EchoBot(args.jid, args.password)
xmpp.register_plugin('xep_0030') # Service Discovery
xmpp.register_plugin('xep_0004') # Data Forms
xmpp.register_plugin('xep_0060') # PubSub
@@ -130,10 +125,10 @@ if __name__ == '__main__':
xmpp.use_proxy = True
xmpp.proxy_config = {
- 'host': opts.proxy_host,
- 'port': int(opts.proxy_port),
- 'username': opts.proxy_user,
- 'password': opts.proxy_pass}
+ 'host': args.proxy_host,
+ 'port': int(args.proxy_port),
+ 'username': args.proxy_user,
+ 'password': args.proxy_pass}
# Connect to the XMPP server and start processing XMPP stanzas.
xmpp.connect()