openstack/python-saharaclient
Code Issues Proposed changes

Fix for sahara CLI

Browse Source 
Sahara CLI did not work because 'safe_encode' and 'safe_decode'
methods have been moved from 'oslo.utils.strutils' module
to 'oslo.utils.encodeutils' module

Change-Id: Ica8cf4e8ec058fa0764e69945609f2a19effb840
Closes-bug: #1409432
This commit is contained in:
Sergey Reshetnyak
2015-01-11 15:15:52 +03:00
parent 0a05d23149
commit 388ba75fb6
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)