summaryrefslogtreecommitdiff
path: root/lib/thandy/formats.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/thandy/formats.py')
-rw-r--r--lib/thandy/formats.py8
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