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, 4 deletions

diff --git a/lib/thandy/SignerCLI.py b/lib/thandy/SignerCLI.py
index 476e7d5..7427474 100644
--- a/lib/thandy/SignerCLI.py
+++ b/lib/thandy/SignerCLI.py
@@ -4,13 +4,12 @@ import os
 import getopt
 import sys
 import logging
-try:
-    import json
-except ImportError:
-    import simplejson as json
 
 import thandy.keys
 import thandy.formats
+import thandy.util
+
+json = thandy.util.importJSON()
 
 def getKeyStore():
     return thandy.keys.KeyStore(thandy.util.userFilename("secret_keys"))