From 59677fb2e5bd07c08454cb6696deab13054e56ad Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Wed, 4 Jan 2023 12:12:47 -0500 Subject: [PATCH] remove simplejson requirement The json lib has been included in CPython for ages, so the ImportError case never happens. Change-Id: I669bc397323a0e83d4a9768b124a7d99bafaf38a --- cinderclient/client.py | 6 +----- requirements.txt | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cinderclient/client.py b/cinderclient/client.py index 2c1006ff8..c99a2e7a6 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 @@ -46,11 +47,6 @@ try: 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: diff --git a/requirements.txt b/requirements.txt index 6f8e90b3f..4c8197620 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