summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-02-10 20:11:04 +0000
committerGerrit Code Review <review@openstack.org>2023-02-10 20:11:04 +0000
commitc8eb9bd0a9e1826a8efd67e71205fb57e7fd155e (patch)
tree292fdefa65f503b82d55627244c5f448c579c801
parent6579899d3aedfaf041850c10904c9e4769809c20 (diff)
parent59677fb2e5bd07c08454cb6696deab13054e56ad (diff)
downloadpython-cinderclient-c8eb9bd0a9e1826a8efd67e71205fb57e7fd155e.tar.gz
Merge "remove simplejson requirement"
-rw-r--r--cinderclient/client.py6
-rw-r--r--requirements.txt1
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