openstack/python-troveclient
Code Issues Proposed changes

Drop unused simplejson

Browse Source 
simplejson is used only when the json module is not avaialble, but
recent runtime versions provide the built-in json module.

Change-Id: Ife04be18ed3804a90e52025d3a7f688e6daec849
This commit is contained in:
Takashi Kajinami 2023-11-05 18:27:58 +09:00
parent 1941116aad
commit 00cdc83150
7 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -4,7 +4,6 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
PrettyTable>=0.7.2 # BSD PrettyTable>=0.7.2 # BSD
requests>=2.14.2 # Apache-2.0 requests>=2.14.2 # Apache-2.0
simplejson>=3.5.1 # MIT
oslo.i18n>=3.15.3 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0
keystoneauth1>=3.4.0 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0

6
troveclient/apiclient/client.py
View File

@ -25,14 +25,10 @@ OpenStack Client interface. Handles the REST calls and responses.
# E0202: An attribute inherited from %s hide this method # E0202: An attribute inherited from %s hide this method
# pylint: disable=E0202 # pylint: disable=E0202
import json
import logging import logging
import time import time
try:
import simplejson as json
except ImportError:
import json
import requests import requests
from oslo_utils import importutils from oslo_utils import importutils

6
troveclient/client.py
View File

@ -19,6 +19,7 @@
OpenStack Client interface. Handles the REST calls and responses. OpenStack Client interface. Handles the REST calls and responses.
""" """
import json
import logging import logging
from keystoneauth1 import adapter from keystoneauth1 import adapter
@ -35,11 +36,6 @@ try:
except ImportError: except ImportError:
import time as sleep_lib import time as sleep_lib
try:
import json
except ImportError:
import simplejson as json
osprofiler_web = importutils.try_import("osprofiler.web") osprofiler_web = importutils.try_import("osprofiler.web")

7
troveclient/compat/client.py
View File

@ -14,17 +14,12 @@
# under the License. # under the License.
import httplib2 import httplib2
import json
import logging import logging
import os import os
import sys import sys
import time import time
try:
import json
except ImportError:
import simplejson as json
from troveclient.compat import auth from troveclient.compat import auth
from troveclient.compat import exceptions from troveclient.compat import exceptions

6
troveclient/tests/test_shell.py
View File

@ -12,6 +12,7 @@
# under the License. # under the License.
import io import io
import json
import re import re
import sys import sys
from unittest import mock from unittest import mock
@ -26,11 +27,6 @@ import troveclient.client
from troveclient import exceptions from troveclient import exceptions
import troveclient.shell import troveclient.shell
try:
import json
except ImportError:
import simplejson as json
V2_URL = "http://no.where/v2.0" V2_URL = "http://no.where/v2.0"
V3_URL = "http://no.where/v3" V3_URL = "http://no.where/v3"

8
troveclient/utils.py
View File

@ -14,16 +14,16 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import base64
import json
import os
import sys
import uuid import uuid
import base64
from openstackclient.identity import common as identity_common from openstackclient.identity import common as identity_common
import os
from oslo_utils import encodeutils from oslo_utils import encodeutils
from oslo_utils import uuidutils from oslo_utils import uuidutils
import prettytable import prettytable
import simplejson as json
import sys
from troveclient.apiclient import exceptions from troveclient.apiclient import exceptions

6
troveclient/v1/shell.py
View File

@ -15,16 +15,12 @@
# under the License. # under the License.
import argparse import argparse
import json
import sys import sys
import time import time
from troveclient.i18n import _ from troveclient.i18n import _
try:
import simplejson as json
except ImportError:
import json
from troveclient import exceptions from troveclient import exceptions
from troveclient import utils from troveclient import utils
from troveclient.v1 import modules from troveclient.v1 import modules