summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2014-06-28 15:33:02 -0700
committerschneefux <schneefux+commit@schneefux.xyz>2014-06-28 15:33:02 -0700
commitc5c2f81271b9e835c701d8d0a45503d1ada9a7ff (patch)
treeef0dd0aeb0ee40d71ed17e580540d9c8f774eef7 /boot
parent366bc8847498dacdb69c7f4b78d7c5fe5406de4d (diff)
parent2cc3ff395003eac98b1708c2579d4a544d28a703 (diff)
downloadjasper-client-c5c2f81271b9e835c701d8d0a45503d1ada9a7ff.tar.gz
jasper-client-c5c2f81271b9e835c701d8d0a45503d1ada9a7ff.zip
Merged latest changes.
Diffstat (limited to 'boot')
-rwxr-xr-xboot/boot.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/boot/boot.py b/boot/boot.py
index 245bd4d..12b60eb 100755
--- a/boot/boot.py
+++ b/boot/boot.py
@@ -1,9 +1,10 @@
#!/usr/bin/env python
import os
-import sys
+import json
import urllib2
-import yaml
+import sys
+
import vocabcompiler
import traceback