[FIX] use simplejson as json is not available on Python 2.5 (also simplejson has better perfs)
bzr revid: xmo@openerp.com-20110310155345-8nxu3i92hno4j2yc
This commit is contained in:
parent
099cbcb416
commit
9cf7baee6b
|
@ -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):
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue