[FIX] use simplejson as json is not available on Python 2.5 (also simplejson has better perfs)

bzr revid: xmo@openerp.com-20110310155345-8nxu3i92hno4j2yc

1 files changed, 4 insertions, 5 deletions

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index df21adb8db0..472af88baa9 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
+import glob, os
+from xml.etree import ElementTree
 
-import glob,json,os
-
-#import simplejson as json
+import simplejson
 
 import openerpweb
 
-from xml.etree import ElementTree
 
 class Xml2Json:
     # xml2json-direct
@@ -16,7 +15,7 @@ class Xml2Json:
     # URL: http://code.google.com/p/xml2json-direct/
     @staticmethod
     def convert_to_json(s):
-        return json.dumps(Xml2Json.convert_to_structure(s), sort_keys=True, indent=4)
+        return simplejson.dumps(Xml2Json.convert_to_structure(s), sort_keys=True, indent=4)
 
     @staticmethod
     def convert_to_structure(s):