diff options
Diffstat (limited to 'cinderclient')
| -rw-r--r-- | cinderclient/client.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cinderclient/client.py b/cinderclient/client.py index 2c1006f..c99a2e7 100644 --- a/cinderclient/client.py +++ b/cinderclient/client.py @@ -20,6 +20,7 @@ import glob import hashlib import importlib.util import itertools +import json import logging import os import pkgutil @@ -47,11 +48,6 @@ except ImportError: from time import sleep try: - import json -except ImportError: - import simplejson as json - -try: osprofiler_web = importutils.try_import("osprofiler.web") except Exception: pass |