openstack/python-saharaclient
Code Issues Proposed changes

Merge "Fix for sahara CLI"

Browse Source
This commit is contained in:
Jenkins
2015-01-12 18:20:23 +00:00
committed by Gerrit Code Review
parent 9305f5aa30 388ba75fb6
commit b5c60118ed
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
saharaclient/shell.py
View File

@@ -51,7 +51,8 @@ from keystoneclient.auth.identity.generic import password
from keystoneclient.auth.identity.generic import token
from keystoneclient.auth.identity import v3 as identity
from keystoneclient import session
from oslo.utils import strutils
from oslo_utils import encodeutils
from oslo_utils import strutils
from saharaclient.api import client
from saharaclient.api import shell as shell_api
@@ -702,11 +703,12 @@ class OpenStackHelpFormatter(argparse.HelpFormatter):
def main():
try:
OpenStackSaharaShell().main(map(strutils.safe_decode, sys.argv[1:]))
OpenStackSaharaShell().main(map(encodeutils.safe_decode,
sys.argv[1:]))
except Exception as e:
logger.debug(e, exc_info=1)
print("ERROR: %s" % strutils.safe_encode(six.text_type(e)),
print("ERROR: %s" % encodeutils.safe_encode(six.text_type(e)),
file=sys.stderr)
sys.exit(1)