Merge "Drop unused simplejson"

requirements.txt

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

troveclient/apiclient/client.py

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

troveclient/client.py

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

troveclient/compat/client.py

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

troveclient/tests/test_shell.py

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

troveclient/utils.py

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

troveclient/v1/shell.py

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