summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-12-01 12:27:58 +0000
committerRoger Dingledine <arma@torproject.org>2008-12-01 12:27:58 +0000
commitcf6cfc1954fffe90fd467563b3f8dbca850a832d (patch)
tree4728eb1af5729d410e8eab9e6236e9f0bef2151c /lib
parenta99818b3584e26c5dacbb150ca6af2076c4cd66f (diff)
coderman's hack to make it not traceback on etch. nick should do a
cleaner one if he likes. git-svn-id: file:///home/or/svnrepo/updater/trunk@17425 55e972cd-5a19-0410-ae62-a4d7a52db4cd
Diffstat (limited to 'lib')
-rw-r--r--lib/thandy/ClientCLI.py1
-rw-r--r--lib/thandy/ServerCLI.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/thandy/ClientCLI.py b/lib/thandy/ClientCLI.py
index 3f73662..839889b 100644
--- a/lib/thandy/ClientCLI.py
+++ b/lib/thandy/ClientCLI.py
@@ -8,6 +8,7 @@ import sys
import time
import traceback
+import thandy.keys
import thandy.formats
import thandy.util
from thandy.util import logCtrl
diff --git a/lib/thandy/ServerCLI.py b/lib/thandy/ServerCLI.py
index 98f55e1..aa39aa1 100644
--- a/lib/thandy/ServerCLI.py
+++ b/lib/thandy/ServerCLI.py
@@ -5,9 +5,9 @@ import sys
import getopt
import time
+import thandy.keys
import thandy.formats
import thandy.util
-import thandy.keys
json = thandy.util.importJSON()