From 9cf7baee6bd7aa5e0fc0b58bc2cf04da8fb46d28 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 10 Mar 2011 16:53:45 +0100
Subject: [PATCH] [FIX] use simplejson as json is not available on Python 2.5
 (also simplejson has better perfs)

bzr revid: xmo@openerp.com-20110310155345-8nxu3i92hno4j2yc
---
 addons/base/controllers/main.py | 9 ++++-----
 openerpweb/openerpweb.py        | 9 ++++-----
 2 files changed, 8 insertions(+), 10 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):
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index edd1a907486..d427c8bac89 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -1,10 +1,9 @@
 #!/usr/bin/python
 
-import os,re,sys,traceback,xmlrpclib
+import os, re, sys, traceback, xmlrpclib
 
 import cherrypy.lib.static
-
-import simplejson as json
+import simplejson
 
 import xmlrpctimeout
 
@@ -91,7 +90,7 @@ class JsonRequest(object):
     def parse(self, request):
         self.cherrypy_request = None
         self.cherrypy_session = None
-        d=json.loads(request)
+        d = simplejson.loads(request)
         self.params = d.get("params",{})
         self.session_id = self.params.pop("session_id", None) or "random.random"
         self.session = session_store.setdefault(self.session_id, OpenERPSession())
@@ -126,7 +125,7 @@ class JsonRequest(object):
         print
         #import pprint
         #pprint.pprint(r)
-        return json.dumps(r)
+        return simplejson.dumps(r)
 
 def jsonrequest(f):
     # check cleaner wrapping: