diff options
| author | Zhongyue Luo <lzyeval@gmail.com> | 2012-06-07 12:28:26 +0800 |
|---|---|---|
| committer | Zhongyue Luo <lzyeval@gmail.com> | 2012-06-28 06:04:53 +0800 |
| commit | cb747079d037c163349bd09814690682ae22a302 (patch) | |
| tree | 9c92ac38f6ad3824e781b8ac9d259c57002711a4 /tests/test_s3_token_middleware.py | |
| parent | 23ca656927947dada40591bdd1badd5a531c2983 (diff) | |
| download | keystone-cb747079d037c163349bd09814690682ae22a302.tar.gz keystone-cb747079d037c163349bd09814690682ae22a302.tar.xz keystone-cb747079d037c163349bd09814690682ae22a302.zip | |
Keystone should use openstack.common.jsonutils
Implements blueprint use-common-jsonutils
1. Edit openstack-common.conf and import keystone/openstack/common/jsonutils.py
2. Remove json package imports and replace with jsonutils
Client code in vendor/ hasn't been changed
Change-Id: I57c670fde9f2c2241eddab1b012e8d5e6a72deb7
Diffstat (limited to 'tests/test_s3_token_middleware.py')
| -rw-r--r-- | tests/test_s3_token_middleware.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_s3_token_middleware.py b/tests/test_s3_token_middleware.py index 5a6d167b..1d400ad5 100644 --- a/tests/test_s3_token_middleware.py +++ b/tests/test_s3_token_middleware.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -import json import logging import stubout @@ -24,6 +23,7 @@ import webob from swift.common import utils as swift_utils from keystone.middleware import s3_token +from keystone.openstack.common import jsonutils def denied_request(code): @@ -74,7 +74,7 @@ class FakeHTTPConnection(object): raise Exception ret = {'access': {'token': {'id': 'TOKEN_ID', 'tenant': {'id': 'TENANT_ID'}}}} - body = json.dumps(ret) + body = jsonutils.dumps(ret) status = self.status self.resp = FakeHTTPResponse(status, body) |