diff options
author | Andrey Devyatkin <andrey.a.devyatkin@gmail.com> | 2014-03-27 21:48:06 +0100 |
---|---|---|
committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2014-04-11 16:52:45 +0900 |
commit | a76db4cfc83d4cf7a52d045e4df82ec8b1e3f562 (patch) | |
tree | 18b203f9c0af195c495c602011ee2807e1d97b7c | |
parent | 254295fd70fd6637a98886937ef5f009cdd687cb (diff) | |
download | pygerrit-a76db4cfc83d4cf7a52d045e4df82ec8b1e3f562.tar.gz |
Update examples to use argparse instead of optparse
optparse was deprecated since 2.7 and removed in python 3
Change-Id: Ic5bccb171f45c4948dad47e8fc6fb5830d6dfcff
-rwxr-xr-x | example.py | 48 | ||||
-rwxr-xr-x | rest_example.py | 47 |
2 files changed, 46 insertions, 49 deletions
@@ -26,7 +26,7 @@ """ Example of using the Gerrit client class. """ import logging -import optparse +import argparse import sys from threading import Event import time @@ -37,29 +37,29 @@ from pygerrit.events import ErrorEvent def _main(): - usage = "usage: %prog [options]" - parser = optparse.OptionParser(usage=usage) - parser.add_option('-g', '--gerrit-hostname', dest='hostname', - default='review', - help='gerrit server hostname (default: %default)') - parser.add_option('-p', '--port', dest='port', - type='int', default=29418, - help='port number (default: %default)') - parser.add_option('-u', '--username', dest='username', - help='username') - parser.add_option('-b', '--blocking', dest='blocking', - action='store_true', - help='block on event get (default: False)') - parser.add_option('-t', '--timeout', dest='timeout', - default=None, type='int', - help='timeout (seconds) for blocking event get ' - '(default: None)') - parser.add_option('-v', '--verbose', dest='verbose', - action='store_true', - help='enable verbose (debug) logging') - parser.add_option('-i', '--ignore-stream-errors', dest='ignore', - action='store_true', - help='do not exit when an error event is received') + descr = 'Send request using Gerrit ssh API' + parser = argparse.ArgumentParser(description=descr) + parser.add_argument('-g', '--gerrit-hostname', dest='hostname', + default='review', + help='gerrit server hostname (default: %default)') + parser.add_argument('-p', '--port', dest='port', + type='int', default=29418, + help='port number (default: %default)') + parser.add_argument('-u', '--username', dest='username', + help='username') + parser.add_argument('-b', '--blocking', dest='blocking', + action='store_true', + help='block on event get (default: False)') + parser.add_argument('-t', '--timeout', dest='timeout', + default=None, type='int', + help='timeout (seconds) for blocking event get ' + '(default: None)') + parser.add_argument('-v', '--verbose', dest='verbose', + action='store_true', + help='enable verbose (debug) logging') + parser.add_argument('-i', '--ignore-stream-errors', dest='ignore', + action='store_true', + help='do not exit when an error event is received') (options, _args) = parser.parse_args() if options.timeout and not options.blocking: diff --git a/rest_example.py b/rest_example.py index 346689e..825ed7c 100755 --- a/rest_example.py +++ b/rest_example.py @@ -26,7 +26,7 @@ """ Example of using the Gerrit client REST API. """ import logging -import optparse +import argparse import sys from requests.auth import HTTPBasicAuth, HTTPDigestAuth @@ -44,28 +44,28 @@ from pygerrit.rest.auth import HTTPDigestAuthFromNetrc, HTTPBasicAuthFromNetrc def _main(): - usage = "usage: %prog [options]" - parser = optparse.OptionParser(usage=usage) - - parser.add_option('-g', '--gerrit-url', dest='gerrit_url', - help='gerrit server url') - parser.add_option('-b', '--basic-auth', dest='basic_auth', - action='store_true', - help='use basic auth instead of digest') + descr = 'Send request using Gerrit HTTP API' + parser = argparse.ArgumentParser(description=descr) + parser.add_argument('-g', '--gerrit-url', dest='gerrit_url', + required=True, + help='gerrit server url') + parser.add_argument('-b', '--basic-auth', dest='basic_auth', + action='store_true', + help='use basic auth instead of digest') if _kerberos_support: - parser.add_option('-k', '--kerberos-auth', dest='kerberos_auth', - action='store_true', - help='use kerberos auth') - parser.add_option('-u', '--username', dest='username', - help='username') - parser.add_option('-p', '--password', dest='password', - help='password') - parser.add_option('-n', '--netrc', dest='netrc', - action='store_true', - help='Use credentials from netrc') - parser.add_option('-v', '--verbose', dest='verbose', - action='store_true', - help='enable verbose (debug) logging') + parser.add_argument('-k', '--kerberos-auth', dest='kerberos_auth', + action='store_true', + help='use kerberos auth') + parser.add_argument('-u', '--username', dest='username', + help='username') + parser.add_argument('-p', '--password', dest='password', + help='password') + parser.add_argument('-n', '--netrc', dest='netrc', + action='store_true', + help='Use credentials from netrc') + parser.add_argument('-v', '--verbose', dest='verbose', + action='store_true', + help='enable verbose (debug) logging') (options, _args) = parser.parse_args() @@ -73,9 +73,6 @@ def _main(): logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=level) - if not options.gerrit_url: - parser.error("Must specify Gerrit URL with --gerrit-url") - if _kerberos_support and options.kerberos_auth: if options.username or options.password \ or options.basic_auth or options.netrc: |