openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "Encode exception on ceilometer-client for UnicodeDecodeError"

Browse Source
This commit is contained in:
Jenkins
2013-12-14 04:20:08 +00:00
committed by Gerrit Code Review
parent 011950efc2 0259cd1079
commit 74c57be4e8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometerclient/shell.py
View File

@@ -14,15 +14,20 @@
Command-line interface to the OpenStack Telemetry API. Command-line interface to the OpenStack Telemetry API.
""" """
from __future__ import print_function
import argparse import argparse
import httplib2 import httplib2
import logging import logging
import sys import sys
import six
import ceilometerclient import ceilometerclient
from ceilometerclient import client as ceiloclient from ceilometerclient import client as ceiloclient
from ceilometerclient.common import utils from ceilometerclient.common import utils
from ceilometerclient import exc from ceilometerclient import exc
from ceilometerclient.openstack.common import strutils
class CeilometerShell(object): class CeilometerShell(object):
@@ -291,7 +296,7 @@ def main():
CeilometerShell().main(sys.argv[1:]) CeilometerShell().main(sys.argv[1:])
except Exception as e: except Exception as e:
print >> sys.stderr, e print(strutils.safe_encode(six.text_type(e)), file=sys.stderr)
sys.exit(1) sys.exit(1)
if __name__ == "__main__": if __name__ == "__main__":