diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-10 20:11:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-10 20:11:04 +0000 |
| commit | c8eb9bd0a9e1826a8efd67e71205fb57e7fd155e (patch) | |
| tree | 292fdefa65f503b82d55627244c5f448c579c801 /cinderclient | |
| parent | 6579899d3aedfaf041850c10904c9e4769809c20 (diff) | |
| parent | 59677fb2e5bd07c08454cb6696deab13054e56ad (diff) | |
| download | python-cinderclient-c8eb9bd0a9e1826a8efd67e71205fb57e7fd155e.tar.gz | |
Merge "remove simplejson requirement"
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 |