From 4ebc57ff2a32f7dcaa765995e928b5def6a5cee3 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 1 Dec 2008 05:27:29 +0000 Subject: 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 --- lib/thandy/formats.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/thandy/formats.py') 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 -- cgit v1.2.3