Add a possible workaround for coderman's Ubuntu's simplejson snafus. 1) Only use json instead of simplejson if json actually works. Apparently there is sometimes a json module that is not the kind of json module you get with python2.6. 2) Check to see if json thinks you should escape /, and try to override that "helpful" choice.

git-svn-id: file:///home/or/svnrepo/updater/trunk@17422 55e972cd-5a19-0410-ae62-a4d7a52db4cd

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/thandy/formats.py b/lib/thandy/formats.py
index d5d57a2..54b76f2 100644
--- a/lib/thandy/formats.py
+++ b/lib/thandy/formats.py
@@ -1,16 +1,14 @@
 # Copyright 2008 The Tor Project, Inc.  See LICENSE for licensing information.
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 import time
 import re
 import binascii
 import calendar
 
 import thandy.checkJson
+import thandy.util
+
+json = thandy.util.importJSON()
 
 import Crypto.Hash.SHA256