diff options
| author | Eric Harney <eharney@redhat.com> | 2023-01-04 12:12:47 -0500 |
|---|---|---|
| committer | Eric Harney <eharney@redhat.com> | 2023-01-26 14:30:35 +0000 |
| commit | 59677fb2e5bd07c08454cb6696deab13054e56ad (patch) | |
| tree | 23ce9c1486ff6d7a342a7c378b350bb1fa0abed0 | |
| parent | c66b9911b8dcf89910fcab45e9a8211e30419ccf (diff) | |
| download | python-cinderclient-59677fb2e5bd07c08454cb6696deab13054e56ad.tar.gz | |
remove simplejson requirement
The json lib has been included in CPython for
ages, so the ImportError case never happens.
Change-Id: I669bc397323a0e83d4a9768b124a7d99bafaf38a
| -rw-r--r-- | cinderclient/client.py | 6 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 1 insertions, 6 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 diff --git a/requirements.txt b/requirements.txt index 6f8e90b..4c81976 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ pbr>=5.5.0 # Apache-2.0 PrettyTable>=0.7.2 # BSD keystoneauth1>=4.3.1 # Apache-2.0 -simplejson>=3.5.1 # MIT oslo.i18n>=5.0.1 # Apache-2.0 oslo.utils>=4.8.0 # Apache-2.0 requests>=2.25.1 # Apache-2.0 |