summaryrefslogtreecommitdiff
path: root/freebase-api/freebase/api
diff options
context:
space:
mode:
authormjtnix <mjtnix@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2>2009-03-16 21:50:56 +0000
committermjtnix <mjtnix@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2>2009-03-16 21:50:56 +0000
commitaeff15ff87c93a96c085916150be8b9be57d5e5d (patch)
tree9aae4a48ff6cb352ce0a80674c707cb965083b1a /freebase-api/freebase/api
parentdefe8ae2797fefe2d04e9e4458361f5d0bd083e5 (diff)
clearer error message if neither simplejson nor django.utils.simplejson are found.
git-svn-id: http://freebase-python.googlecode.com/svn/trunk@52 5914aa95-5b3a-0410-a3b5-7b719e7fe9b2
Diffstat (limited to 'freebase-api/freebase/api')
-rw-r--r--freebase-api/freebase/api/session.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/freebase-api/freebase/api/session.py b/freebase-api/freebase/api/session.py
index 1492f7c..4396640 100644
--- a/freebase-api/freebase/api/session.py
+++ b/freebase-api/freebase/api/session.py
@@ -46,7 +46,11 @@ import cookielib
try:
import simplejson
except ImportError:
- from django.utils import simplejson
+ try:
+ # appengine provides simplejson at django.utils.simplejson
+ from django.utils import simplejson
+ except ImportError:
+ raise Error("unable to import simplejson")
try:
from urllib import quote as urlquote
except ImportError: