diff options
| author | Chmouel Boudjnah <chmouel@enovance.com> | 2013-12-15 23:51:43 +0100 |
|---|---|---|
| committer | Chmouel Boudjnah <chmouel@enovance.com> | 2013-12-16 01:19:00 +0100 |
| commit | 62e7e0c77ef22aae6b0c0a85a950fead4d96b074 (patch) | |
| tree | 4da269136d8bfd28f55e75fbf0774bcc8d667651 /heatclient/exc.py | |
| parent | b14697ea3fada6e9f6725fa14e9c669beebd8875 (diff) | |
| download | python-heatclient-62e7e0c77ef22aae6b0c0a85a950fead4d96b074.tar.gz | |
Use jsonutils from oslo incubator
Partial-Bug: #1261224
Change-Id: I9a1e4e661e11a423586869ca504c41028934f8de
Diffstat (limited to 'heatclient/exc.py')
| -rw-r--r-- | heatclient/exc.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/heatclient/exc.py b/heatclient/exc.py index 60be0fd..c3d4117 100644 --- a/heatclient/exc.py +++ b/heatclient/exc.py @@ -12,12 +12,9 @@ import sys -verbose = 0 +from heatclient.openstack.common import jsonutils -try: - import json -except ImportError: - import simplejson as json +verbose = 0 class BaseException(Exception): @@ -48,7 +45,7 @@ class HTTPException(BaseException): def __init__(self, message=None): super(HTTPException, self).__init__(message) try: - self.error = json.loads(message) + self.error = jsonutils.loads(message) if 'error' not in self.error: raise KeyError('Key "error" not exists') except KeyError: |