diff options
author | willmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f> | 2011-04-25 19:22:13 +0000 |
---|---|---|
committer | willmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f> | 2011-04-25 19:22:13 +0000 |
commit | 5768675c3b5c588476afbc4bd13e07866b16a04b (patch) | |
tree | 0cada6693c487b158ec756c87f96f2b4a9ed2371 | |
parent | 9a3f04f7ad47ac61993296d8503cb036b6a88447 (diff) | |
download | pyfilesystem-5768675c3b5c588476afbc4bd13e07866b16a04b.tar.gz |
Added simplejson dependancy to tox.ini
git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@698 67cdc799-7952-0410-af00-57a81ceafa0f
-rw-r--r-- | fs/contrib/tahoelafs/util.py | 6 | ||||
-rw-r--r-- | tox.ini | 1 |
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
@@ -9,6 +9,7 @@ deps=dexml pyftpdlib [testenv:py25] +deps = simplejson commands = nosetests -v \ [] |