diff options
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 5 | ||||
| -rw-r--r-- | addons/web/controllers/testing.py | 7 |
2 files changed, 5 insertions, 7 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 diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py index b51b12fc53d..0160f0f28cd 100644 --- a/addons/web/controllers/testing.py +++ b/addons/web/controllers/testing.py @@ -9,11 +9,10 @@ import os from mako.template import Template from openerp.modules import module +from openerp import http +from openerp.http import request from .main import module_topological_sort -from .. import http - -from ..http import request NOMODULE_TEMPLATE = Template(u"""<!DOCTYPE html> <html> @@ -171,4 +170,4 @@ class TestRunnerController(http.Controller): @http.route('/web/tests/get_session_value', type='json', auth="none") def get_session_value(self): - return request.session.some_test_value
\ No newline at end of file + return request.session.some_test_value |