Tidy up pinout a little:

Ensure all error messages are printed on stderr instead of stdout; make
sure all errors formatted the same and that argparse's default exit
codes are followed
This commit is contained in:
Dave Jones
2017-06-13 16:15:15 +01:00
parent 97ffabe764
commit 4725c6b68c

View File

@@ -10,57 +10,56 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi
import argparse import argparse
import sys import sys
from gpiozero import * from gpiozero import pi_info
def parse_args(args): class PinoutTool(object):
parser = argparse.ArgumentParser( def __init__(self):
self.parser = argparse.ArgumentParser(
description=__doc__ description=__doc__
) )
self.parser.add_argument(
parser.add_argument(
'-r', '--revision', '-r', '--revision',
dest='revision', dest='revision',
default='', default='',
help='RPi revision. Default is to autodetect revision of current device' help='RPi revision. Default is to autodetect revision of current device'
) )
self.parser.add_argument(
parser.add_argument(
'-c', '--color', '-c', '--color',
action="store_true", action="store_true",
default=None, default=None,
help='Force colored output (by default, the output will include ANSI' help='Force colored output (by default, the output will include ANSI'
'color codes if run in a color-capable terminal). See also --monochrome' 'color codes if run in a color-capable terminal). See also --monochrome'
) )
self.parser.add_argument(
parser.add_argument(
'-m', '--monochrome', '-m', '--monochrome',
dest='color', dest='color',
action='store_false', action='store_false',
help='Force monochrome output. See also --color' help='Force monochrome output. See also --color'
) )
def __call__(self, args=None):
if args is None:
args = sys.argv[1:]
try: try:
args = parser.parse_args(args) return self.main(self.parser.parse_args(args)) or 0
except argparse.ArgumentError as ex: except argparse.ArgumentError as e:
print('Error parsing arguments.') # argparse errors are already nicely formatted, print to stderr and
parser.error(str(ex.message)) # exit with code 2
sys.exit(1) raise e
return args except Exception as e:
# Output anything else nicely formatted on stderr and exit code 1
self.parser.exit(1, '{prog}: error: {message}\n'.format(
def main(): prog=self.parser.prog, message=e))
args = parse_args(sys.argv[1:])
def main(self, args):
if args.revision == '': if args.revision == '':
try: try:
pi_info().pprint(color=args.color) pi_info().pprint(color=args.color)
except IOError: except IOError:
print('This device is not a Raspberry Pi') raise IOError('This device is not a Raspberry Pi')
sys.exit(1)
else: else:
pi_info(args.revision).pprint(color=args.color) pi_info(args.revision).pprint(color=args.color)
if __name__ == '__main__': main = PinoutTool()
main()