diff options
| author | Zack M. Davis <zdavis@swiftstack.com> | 2015-10-30 11:02:54 -0700 |
|---|---|---|
| committer | Zack M. Davis <zdavis@swiftstack.com> | 2015-11-16 12:34:24 -0800 |
| commit | 1b8b08039a3647ffdb30225b0939055982942159 (patch) | |
| tree | 16c874ac8cbd5dbfe2b482a02c3fc7fb945730d4 /swift/obj/auditor.py | |
| parent | c03d53ab7737e208d9c436088e41f60fdab96b30 (diff) | |
| download | swift-1b8b08039a3647ffdb30225b0939055982942159.tar.gz | |
remove remaining simplejson uses, prefer standard library import
a1c32702, 736cf54a, and 38787d0f remove uses of `simplejson` from
various parts of Swift in favor of the standard libary `json`
module (introduced in Python 2.6). This commit performs the remaining
`simplejson` to `json` replacements, removes two comments highlighting
quirks of simplejson with respect to Unicode, and removes the references
to it in setup documentation and requirements.txt.
There were a lot of places where we were importing json from
swift.common.utils, which is less intuitive than a direct `import json`,
so that replacement is made as well.
(And in two more tiny drive-bys, we add some pretty-indenting to an XML
fragment and use `super` rather than naming a base class explicitly.)
Change-Id: I769e88dda7f76ce15cf7ce930dc1874d24f9498a
Diffstat (limited to 'swift/obj/auditor.py')
| -rw-r--r-- | swift/obj/auditor.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/swift/obj/auditor.py b/swift/obj/auditor.py index 4875bb252..38fef209e 100644 --- a/swift/obj/auditor.py +++ b/swift/obj/auditor.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import json import os import sys import time @@ -24,7 +25,7 @@ from eventlet import Timeout from swift.obj import diskfile from swift.common.utils import get_logger, ratelimit_sleep, dump_recon_cache, \ - list_from_csv, json, listdir + list_from_csv, listdir from swift.common.exceptions import DiskFileQuarantined, DiskFileNotExist from swift.common.daemon import Daemon |