diff options
Diffstat (limited to 'lib/thandy/ClientCLI.py')
-rw-r--r-- | lib/thandy/ClientCLI.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/thandy/ClientCLI.py b/lib/thandy/ClientCLI.py index fa73ab2..3f73662 100644 --- a/lib/thandy/ClientCLI.py +++ b/lib/thandy/ClientCLI.py @@ -7,10 +7,6 @@ import re import sys import time import traceback -try: - import json -except ImportError: - import simplejson as json import thandy.formats import thandy.util @@ -22,6 +18,8 @@ import thandy.packagesys.PackageSystem import thandy.socksurls import thandy.encodeToXML +json = thandy.util.importJSON() + class ControlLogFormatter: def _formatStr(self, s): s = '"%s"' % re.sub(r'(["\\])', r'\\\1', s) |