From 953cd995008098b2bd14959556811fa1757b5e76 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 5 Oct 2011 21:32:54 +0200 Subject: little fix for simple_json + js engine --- module/common/json_layer.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'module/common/json_layer.py') diff --git a/module/common/json_layer.py b/module/common/json_layer.py index 7b1c80bb5..4d57a9f38 100644 --- a/module/common/json_layer.py +++ b/module/common/json_layer.py @@ -7,10 +7,7 @@ try: # since python 2.6 import json from json import loads as json_loads from json import dumps as json_dumps -except ImportError: - 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" +except ImportError: #use system simplejson if available + import simplejson as json + from simplejson import loads as json_loads + from simplejson import dumps as json_dumps -- cgit v1.2.3