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, 2 insertions, 5 deletions

diff --git a/lib/thandy/ServerCLI.py b/lib/thandy/ServerCLI.py
index 5e2c424..98f55e1 100644
--- a/lib/thandy/ServerCLI.py
+++ b/lib/thandy/ServerCLI.py
@@ -5,15 +5,12 @@ import sys
 import getopt
 import time
 
-try:
-    import json
-except:
-    import simplejson as json
-
 import thandy.formats
 import thandy.util
 import thandy.keys
 
+json = thandy.util.importJSON()
+
 def tstamp():
     return time.strftime("%Y%m%d_%H%M%S", time.localtime())