diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-04 15:35:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-04 15:35:37 +0000 |
| commit | 93766cd28d2d90aa18d88a39866236256497b40f (patch) | |
| tree | b59b5f8aa501d6a9001722a066dffd2ac33ebc3a | |
| parent | a8b8798f720dcab872220a7219fe204608ed1357 (diff) | |
| parent | 2e16b1f1e5837ed0bd10cac4fba08ed9d72a36cb (diff) | |
| download | swift-93766cd28d2d90aa18d88a39866236256497b40f.tar.gz | |
Merge "Update swift.common.db to us swift.cmmn.utils.json"
| -rw-r--r-- | swift/common/db.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/swift/common/db.py b/swift/common/db.py index dbc255635..6b30db462 100644 --- a/swift/common/db.py +++ b/swift/common/db.py @@ -29,10 +29,9 @@ import errno from tempfile import mkstemp from eventlet import sleep, Timeout -import simplejson as json import sqlite3 -from swift.common.utils import normalize_timestamp, renamer, \ +from swift.common.utils import json, normalize_timestamp, renamer, \ mkdirs, lock_parent_directory, fallocate from swift.common.exceptions import LockTimeout |