summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/contrib/tahoelafs/util.py6
-rw-r--r--tox.ini1
2 files changed, 6 insertions, 1 deletions
diff --git a/fs/contrib/tahoelafs/util.py b/fs/contrib/tahoelafs/util.py
index d455edc..fda8a2b 100644
--- a/fs/contrib/tahoelafs/util.py
+++ b/fs/contrib/tahoelafs/util.py
@@ -16,7 +16,11 @@ try:
# is not in standard CPython >=2.6 library.
import simplejson as json
except ImportError:
- import json
+ try:
+ import json
+ except ImportError:
+ print "simplejson (http://pypi.python.org/pypi/simplejson/) required"
+ raise
from .connection import Connection
diff --git a/tox.ini b/tox.ini
index eae4ef8..1d849a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ deps=dexml
pyftpdlib
[testenv:py25]
+deps = simplejson
commands = nosetests -v \
[]