Merge "Update swift.common.db to us swift.cmmn.utils.json"

Mirantis · Sep 4, 2012 · 93766cd · 93766cd
2 parents a8b8798 + 2e16b1f
commit 93766cd
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/swift/common/db.py b/swift/common/db.py
@@ -29,10 +29,9 @@
 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