summaryrefslogtreecommitdiff
path: root/addons/web/controllers/main.py
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2013-10-27 18:17:17 +0100
committerAntony Lesuisse <al@openerp.com>2013-10-27 18:17:17 +0100
commit401099d35841bc347559eca86c195464d857f5d9 (patch)
tree63bef8713946355c6b96967cfaea2e18b3aa4c3b /addons/web/controllers/main.py
parenta56909360679351c5148038259c00a89161c0bc0 (diff)
[IMP] move http layer from openerp-web to openobject-server, convert controllers to the new route api
bzr revid: al@openerp.com-20131027171717-dzqx2264p152lq8y
Diffstat (limited to 'addons/web/controllers/main.py')
-rw-r--r--addons/web/controllers/main.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7a52f289f8f..4c95f4d5f32 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -33,10 +33,9 @@ import openerp
import openerp.modules.registry
from openerp.tools.translate import _
from openerp.tools import config
+from openerp import http
-from .. import http
-
-from openerp.addons.web.http import request
+from openerp.http import request
#----------------------------------------------------------
# OpenERP Web helpers