summaryrefslogtreecommitdiff
path: root/examples/thirdparty_auth.py
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-08-16 22:37:29 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-09-01 02:47:15 +0200
commit866014896091d83164a6503adf9035146cf49963 (patch)
tree23ab757e3a8d69a2741d0c907d2a0574c6be7002 /examples/thirdparty_auth.py
parent67ca2dd0f45b112e206fb80eb4613960f312f721 (diff)
downloadslixmpp-866014896091d83164a6503adf9035146cf49963.tar.gz
slixmpp-866014896091d83164a6503adf9035146cf49963.tar.bz2
slixmpp-866014896091d83164a6503adf9035146cf49963.tar.xz
slixmpp-866014896091d83164a6503adf9035146cf49963.zip
Move examples from the deprecated optparse to argparse, and remove the redundant -v option.
Diffstat (limited to 'examples/thirdparty_auth.py')
-rwxr-xr-xexamples/thirdparty_auth.py45
1 files changed, 21 insertions, 24 deletions
diff --git a/examples/thirdparty_auth.py b/examples/thirdparty_auth.py
index 8f402087..9318854b 100755
--- a/examples/thirdparty_auth.py
+++ b/examples/thirdparty_auth.py
@@ -12,7 +12,7 @@
import sys
import logging
from getpass import getpass
-from optparse import OptionParser
+from argparse import ArgumentParser
try:
from httplib import HTTPSConnection
@@ -94,35 +94,32 @@ class ThirdPartyAuthBot(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")
+ parser.add_argument("-j", "--jid", dest="jid",
+ help="JID to use")
+ parser.add_argument("-p", "--password", dest="password",
+ help="password to use")
- opts, args = optp.parse_args()
+ 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 args.jid is None:
+ args.jid = input("Username: ")
+ if args.password is None:
+ args.password = getpass("Password: ")
access_token = None
@@ -146,8 +143,8 @@ if __name__ == '__main__':
params = urlencode({
'accountType': 'GOOGLE',
'service': 'mail',
- 'Email': JID(opts.jid).bare,
- 'Passwd': opts.password
+ 'Email': JID(args.jid).bare,
+ 'Passwd': args.password
})
headers = {
'Content-Type': 'application/x-www-form-urlencoded'
@@ -198,7 +195,7 @@ if __name__ == '__main__':
# We're using an access token instead of a password, so we'll use `''` as
# a password argument filler.
- xmpp = ThirdPartyAuthBot(opts.jid, '')
+ xmpp = ThirdPartyAuthBot(args.jid, '')
xmpp.credentials['access_token'] = access_token
# The credentials dictionary is used to provide additional authentication