diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index e25d94d4f73..21df7a02214 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import glob,json,os,sys,traceback +import glob,json,os #import simplejson as json @@ -107,7 +107,7 @@ class Connection(openerpweb.Controller): # TODO http get argument mods is a comma seprated value of modules mods = 'base,base_hello' files = self.manifest_glob(mods.split(','), 'css') - (concat, timestamp) = self.concat_files(files) + concat = self.concat_files(files)[0] # TODO request set the Date of last modif and Etag return concat css.exposed=1 @@ -116,7 +116,7 @@ class Connection(openerpweb.Controller): # TODO http get argument mods is a comma seprated value of modules mods = 'base,base_hello' files = self.manifest_glob(mods.split(','), 'js') - (concat, timestamp) = self.concat_files(files) + concat = self.concat_files(files)[0] # TODO request set the Date of last modif and Etag return concat js.exposed=1 diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 601599f35d0..edd1a907486 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -2,7 +2,7 @@ import os,re,sys,traceback,xmlrpclib -import cherrypy,cherrypy.lib.static +import cherrypy.lib.static import simplejson as json diff --git a/openerpweb/xmlrpctimeout.py b/openerpweb/xmlrpctimeout.py index 15193115d0f..28f9bcd41bd 100644 --- a/openerpweb/xmlrpctimeout.py +++ b/openerpweb/xmlrpctimeout.py @@ -1,6 +1,5 @@ import xmlrpclib import httplib -import socket class TimeoutHTTPConnection(httplib.HTTPConnection): def connect(self):