openstack/python-glanceclient
Code Issues Proposed changes

Use utils.exit rather than print+sys.exit

Browse Source 
This replaces the use of a pattern along the lines of

    print(error message)
    sys.exit(1)

in a couple of place in the shell. utils.exit does much the same job,
but outputs to stderr.

Change-Id: I1d3b52e0685772c10aa806a8f208eb6dd7a0e7ef
This commit is contained in:
Louis Taylor
2014-10-22 15:13:19 +00:00
committed by Rakesh H S
parent 5ec4a24b89
commit 869e6ace0e
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glanceclient/shell.py
View File

@@ -697,8 +697,6 @@ def main():
try: try:
OpenStackImagesShell().main(map(encodeutils.safe_decode, sys.argv[1:])) OpenStackImagesShell().main(map(encodeutils.safe_decode, sys.argv[1:]))
except KeyboardInterrupt: except KeyboardInterrupt:
print('... terminating glance client', file=sys.stderr) utils.exit('... terminating glance client')
sys.exit(1)
except Exception as e: except Exception as e:
print(utils.exception_to_str(e), file=sys.stderr) utils.exit(utils.exception_to_str(e))
sys.exit(1)

9
glanceclient/v1/shell.py
View File

@@ -18,7 +18,6 @@ from __future__ import print_function
import copy import copy
import functools import functools
import six import six
import sys
from oslo.utils import encodeutils from oslo.utils import encodeutils
from oslo.utils import strutils from oslo.utils import strutils
@@ -349,15 +348,15 @@ def do_image_delete(gc, args):
def do_member_list(gc, args): def do_member_list(gc, args):
"""Describe sharing permissions by image or tenant.""" """Describe sharing permissions by image or tenant."""
if args.image_id and args.tenant_id: if args.image_id and args.tenant_id:
print('Unable to filter members by both --image-id and --tenant-id.') utils.exit('Unable to filter members by both --image-id and'
sys.exit(1) ' --tenant-id.')
elif args.image_id: elif args.image_id:
kwargs = {'image': args.image_id} kwargs = {'image': args.image_id}
elif args.tenant_id: elif args.tenant_id:
kwargs = {'member': args.tenant_id} kwargs = {'member': args.tenant_id}
else: else:
print('Unable to list all members. Specify --image-id or --tenant-id') utils.exit('Unable to list all members. Specify --image-id or'
sys.exit(1) ' --tenant-id')
members = gc.image_members.list(**kwargs) members = gc.image_members.list(**kwargs)
columns = ['Image ID', 'Member ID', 'Can Share'] columns = ['Image ID', 'Member ID', 'Can Share']