Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/activity.py
diff options
context:
space:
mode:
authorAgustin Zubiaga <aguz@sugarlabs.org>2013-11-17 03:13:36 (GMT)
committer Agustin Zubiaga <aguz@sugarlabs.org>2013-11-17 03:13:36 (GMT)
commit187dedb344526b9bb67fdd5a014a54434f0f87a0 (patch)
tree0751764d80db6adc50baece5f49e280fb48fd424 /activity.py
parent29d7c250e021b17e5e643db9f5e21e8967d8e215 (diff)
Use simplejson if json isn't in the system
Signed-off-by: Agustin Zubiaga <aguz@sugarlabs.org>
Diffstat (limited to 'activity.py')
-rw-r--r--activity.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/activity.py b/activity.py
index da66477..1947f35 100644
--- a/activity.py
+++ b/activity.py
@@ -24,7 +24,12 @@ from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GObject
import os
-import simplejson
+
+try:
+ import json
+except ImportError:
+ import simplejson as json
+
import locale
import logging
import utils