From 5eb2f500fde9fbadaf2f48d82e61ceec5a635b17 Mon Sep 17 00:00:00 2001 From: reedip Date: Thu, 28 Jan 2016 17:43:34 +0900 Subject: TrivialFix of Import JSON As per the comment#12 in [1], the if loop can be removed and json can be directly imported from bench.py [1]: https://review.openstack.org/#/c/264486/ TrivialFix Depends-On:I7c8a1a39f0e86cbd38466c2dcd611a8f513c8adc Change-Id: I519753b0db0d8eee70c84afa92dfab2b943afbac --- swiftbench/bench.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/swiftbench/bench.py b/swiftbench/bench.py index ae44f2f..696b6ad 100644 --- a/swiftbench/bench.py +++ b/swiftbench/bench.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import json import re import sys import uuid @@ -32,10 +33,6 @@ import swiftclient as client from swiftbench.utils import config_true_value, using_http_proxy -try: - import simplejson as json -except ImportError: - import json try: from swift.common import direct_client -- cgit v1.2.1