From 4d39af8d89233001d607519a6d94a82d67818779 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 15 Oct 2008 21:27:16 +0000 Subject: In python 2.6 and later, simplejson is built-in as json. git-svn-id: file:///home/or/svnrepo/updater/trunk@17112 55e972cd-5a19-0410-ae62-a4d7a52db4cd --- lib/thandy/ServerCLI.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/thandy/ServerCLI.py') diff --git a/lib/thandy/ServerCLI.py b/lib/thandy/ServerCLI.py index 2090ed9..794e119 100644 --- a/lib/thandy/ServerCLI.py +++ b/lib/thandy/ServerCLI.py @@ -5,7 +5,10 @@ import sys import getopt import time -import simplejson +try: + import json +except: + import simplejson as json import thandy.formats import thandy.util @@ -24,7 +27,7 @@ def snarf(fname): def snarfObj(fname): f = open(fname, 'r') try: - return simplejson.load(f) + return json.load(f) finally: f.close() @@ -65,7 +68,7 @@ def insert(args): continue try: - obj = simplejson.loads(content) + obj = json.loads(content) except ValueError, e: print "Couldn't decode %s: %s"%(fn, e) continue @@ -165,7 +168,7 @@ def timestamp(args): for k in keydb.iterkeys(): thandy.formats.sign(signable, k) - content = simplejson.dumps(signable, sort_keys=True) + content = json.dumps(signable, sort_keys=True) thandy.util.replaceFile(tsFname, content) def usage(): -- cgit v1.2.3