diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-01-30 16:33:28 +1100 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-01-30 16:33:28 +1100 |
| commit | 50f56b83e73b884450faba3be93bb4cd6bd36ff1 (patch) | |
| tree | 073e74bb5df7eb15f2ee5672f384f40313e36bdf | |
| parent | 26f5e1bf95f72f42934095423fe7600741c331cd (diff) | |
| download | swift-bench-50f56b83e73b884450faba3be93bb4cd6bd36ff1.tar.gz | |
Cleanup based on pyflakes.
pyflakes itself can't be used in any automated gating way, because there are
two sets of false errors it raises. However, as an exercise, cleaning up the
'valid' ones uncovered three actual bugs. The other changes (mostly unused
variables) are included here for fun.
Command run: pyflakes swift | grep -v "undefined name '_'"
Change-Id: I18696bf047dedad1a9fdbde3463e214fba95f7c6
| -rw-r--r-- | swift/common/bench.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/swift/common/bench.py b/swift/common/bench.py index c6da410..3b8070b 100644 --- a/swift/common/bench.py +++ b/swift/common/bench.py @@ -32,11 +32,7 @@ from swift.common.utils import config_true_value, LogAdapter import swiftclient as client from swift.common import direct_client from swift.common.http import HTTP_CONFLICT - -try: - import simplejson as json -except ImportError: - import json +from swift.common.utils import json def _func_on_containers(logger, conf, concurrency_key, func): |