diff options
author | cao.yuan <cao.yuan@99cloud.net> | 2019-02-25 00:26:24 +0800 |
---|---|---|
committer | caoyuan <cao.yuan@99cloud.net> | 2019-02-25 11:35:14 +0000 |
commit | 7a8ed5e3126b0f1969b93c39b626966731c6e7b5 (patch) | |
tree | 78f33716401acc5785d29908ec9f22cb7e3c6e76 | |
parent | 6c4bb8b529edc2e619fdda212f21dca8160decad (diff) | |
download | python-keystoneclient-7a8ed5e3126b0f1969b93c39b626966731c6e7b5.tar.gz |
Update json module to jsonutils
oslo project provide jsonutils, and keystoneclient use it in many place[1],
this PS to update the remained json module to oslo jsonutils for
consistency.
[1]: https://github.com/openstack/python-keystoneclient/search?utf8=%E2%9C%93&q=jsonutils&type=
Change-Id: Id5275b5e6b5bf8f6d54406dac7ab95a30828cf58
-rw-r--r-- | examples/pki/gen_cmsz.py | 9 | ||||
-rw-r--r-- | keystoneclient/auth/identity/v3/base.py | 4 | ||||
-rw-r--r-- | keystoneclient/tests/unit/v2_0/test_client.py | 11 | ||||
-rw-r--r-- | keystoneclient/tests/unit/v3/test_client.py | 10 |
4 files changed, 18 insertions, 16 deletions
diff --git a/examples/pki/gen_cmsz.py b/examples/pki/gen_cmsz.py index 6840c08..bd0d886 100644 --- a/examples/pki/gen_cmsz.py +++ b/examples/pki/gen_cmsz.py @@ -12,9 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -import json import os +from oslo_serialization import jsonutils + from keystoneclient.common import cms from keystoneclient import utils @@ -44,7 +45,7 @@ def generate_revocation_list(): 'id': id, "expires": "2112-08-14T17:58:48Z" }) - revoked_json = json.dumps({"revoked": revoked_list}) + revoked_json = jsonutils.dumps({"revoked": revoked_list}) with open(make_filename('cms', 'revocation_list.json'), 'w') as f: f.write(revoked_json) encoded = cms.pkiz_sign(revoked_json, @@ -91,12 +92,12 @@ for name in EXAMPLE_TOKENS: # validate the JSON try: - token_data = json.loads(string_data) + token_data = jsonutils.loads(string_data) except ValueError as v: raise SystemExit('%s while processing token data from %s: %s' % (v, json_file, string_data)) - text = json.dumps(token_data).encode('utf-8') + text = jsonutils.dumps(token_data).encode('utf-8') # Uncomment to record the token uncompressed, # useful for debugging diff --git a/keystoneclient/auth/identity/v3/base.py b/keystoneclient/auth/identity/v3/base.py index 51d16ea..33f354e 100644 --- a/keystoneclient/auth/identity/v3/base.py +++ b/keystoneclient/auth/identity/v3/base.py @@ -11,10 +11,10 @@ # under the License. import abc -import json import logging from oslo_config import cfg +from oslo_serialization import jsonutils import six from keystoneclient import access @@ -189,7 +189,7 @@ class Auth(BaseAuth): authenticated=False, log=False, **rkwargs) try: - _logger.debug(json.dumps(resp.json())) + _logger.debug(jsonutils.dumps(resp.json())) resp_data = resp.json()['token'] except (KeyError, ValueError): raise exceptions.InvalidResponse(response=resp) diff --git a/keystoneclient/tests/unit/v2_0/test_client.py b/keystoneclient/tests/unit/v2_0/test_client.py index cddac4d..7fe9b18 100644 --- a/keystoneclient/tests/unit/v2_0/test_client.py +++ b/keystoneclient/tests/unit/v2_0/test_client.py @@ -10,9 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -import json import uuid +from oslo_serialization import jsonutils + from keystoneauth1 import fixture from keystoneauth1 import session as auth_session @@ -75,10 +76,10 @@ class KeystoneClientTest(utils.TestCase): password='password', project_name='exampleproject', auth_url=self.TEST_URL) - cache = json.dumps(cl.auth_ref) + cache = jsonutils.dumps(cl.auth_ref) # Creating a HTTPClient not using session is deprecated. with self.deprecations.expect_deprecations_here(): - new_client = client.Client(auth_ref=json.loads(cache)) + new_client = client.Client(auth_ref=jsonutils.loads(cache)) self.assertIsNotNone(new_client.auth_ref) with self.deprecations.expect_deprecations_here(): self.assertTrue(new_client.auth_ref.scoped) @@ -100,11 +101,11 @@ class KeystoneClientTest(utils.TestCase): password='password', project_name='exampleproject', auth_url=self.TEST_URL) - cache = json.dumps(cl.auth_ref) + cache = jsonutils.dumps(cl.auth_ref) new_auth_url = "http://new-public:5000/v2.0" # Creating a HTTPClient not using session is deprecated. with self.deprecations.expect_deprecations_here(): - new_client = client.Client(auth_ref=json.loads(cache), + new_client = client.Client(auth_ref=jsonutils.loads(cache), auth_url=new_auth_url) self.assertIsNotNone(new_client.auth_ref) with self.deprecations.expect_deprecations_here(): diff --git a/keystoneclient/tests/unit/v3/test_client.py b/keystoneclient/tests/unit/v3/test_client.py index feb921a..82088fd 100644 --- a/keystoneclient/tests/unit/v3/test_client.py +++ b/keystoneclient/tests/unit/v3/test_client.py @@ -11,9 +11,9 @@ # under the License. import copy -import json import uuid +from oslo_serialization import jsonutils from keystoneauth1 import session as auth_session from keystoneclient.auth import token_endpoint @@ -90,10 +90,10 @@ class KeystoneClientTest(utils.TestCase): password='password', project_id=token.project_id, auth_url=self.TEST_URL) - cache = json.dumps(c.auth_ref) + cache = jsonutils.dumps(c.auth_ref) # Creating a HTTPClient not using session is deprecated. with self.deprecations.expect_deprecations_here(): - new_client = client.Client(auth_ref=json.loads(cache)) + new_client = client.Client(auth_ref=jsonutils.loads(cache)) self.assertIsNotNone(new_client.auth_ref) self.assertFalse(new_client.auth_ref.domain_scoped) self.assertTrue(new_client.auth_ref.project_scoped) @@ -124,10 +124,10 @@ class KeystoneClientTest(utils.TestCase): password='password', project_id=project_id, auth_url=self.TEST_URL) - cache = json.dumps(c.auth_ref) + cache = jsonutils.dumps(c.auth_ref) # Creating a HTTPClient not using session is deprecated. with self.deprecations.expect_deprecations_here(): - new_client = client.Client(auth_ref=json.loads(cache), + new_client = client.Client(auth_ref=jsonutils.loads(cache), auth_url=new_auth_url) self.assertIsNotNone(new_client.auth_ref) self.assertFalse(new_client.auth_ref.domain_scoped) |