summaryrefslogtreecommitdiffstats
path: root/module/common
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-10-05 15:23:20 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-10-05 15:23:20 +0200
commita2cdb4eefcd5e745b35196a69bbf4d916de5c41e (patch)
tree2ff9db9a04eaf2aee9d7780d478435d18081dc9c /module/common
parentclosed #161 (diff)
downloadpyload-a2cdb4eefcd5e745b35196a69bbf4d916de5c41e.tar.xz
updated simplejson
Diffstat (limited to 'module/common')
-rw-r--r--module/common/json_layer.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/module/common/json_layer.py b/module/common/json_layer.py
index a075d2527..7b1c80bb5 100644
--- a/module/common/json_layer.py
+++ b/module/common/json_layer.py
@@ -8,6 +8,9 @@ try: # since python 2.6
from json import loads as json_loads
from json import dumps as json_dumps
except ImportError:
- import module.lib.simplejson as json
- from module.lib.simplejson import loads as json_loads
- from module.lib.simplejson import dumps as json_dumps \ No newline at end of file
+ try:
+ import module.lib.simplejson as json
+ from module.lib.simplejson import loads as json_loads
+ from module.lib.simplejson import dumps as json_dumps
+ except:
+ print "Could not import simplejson"