Merge "Drop direct dependency on simplejson"

Author: Zuul

openstackclient/api/api.py

@@ -12,11 +12,10 @@
 #
 
 """Base API Library"""
-
 from keystoneauth1 import exceptions as ks_exceptions
 from keystoneauth1 import session as ks_session
 from osc_lib import exceptions
-import simplejson as json
+import requests
 
 from openstackclient.i18n import _
 
@@ -118,7 +117,7 @@ def create(self, url, session=None, method=None, **params):
         # Should this move into _requests()?
         try:
             return ret.json()
-        except json.JSONDecodeError:
+        except requests.JSONDecodeError:
             return ret
 
     def delete(self, url, session=None, **params):
@@ -169,7 +168,7 @@ def list(self, path, session=None, body=None, detailed=False, **params):
             )
         try:
             return ret.json()
-        except json.JSONDecodeError:
+        except requests.JSONDecodeError:
             return ret
 
     # Layered actions built on top of the basic action methods do not

requirements.txt

@@ -13,4 +13,5 @@ oslo.i18n>=3.15.3 # Apache-2.0
 python-keystoneclient>=3.22.0 # Apache-2.0
 python-novaclient>=18.1.0 # Apache-2.0
 python-cinderclient>=3.3.0 # Apache-2.0
+requests>=2.14.2 # Apache-2.0
 stevedore>=2.0.1 # Apache-2.0