summaryrefslogtreecommitdiff
path: root/addons/web/common/http.py
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-02-10 11:34:26 +0100
committerXavier Morel <xmo@openerp.com>2012-02-10 11:34:26 +0100
commitaf8864d571bdaf0b87a63ca6fa0a4fb5ea5c36f0 (patch)
tree5d6c384d5e5e7cb90a1ec20bae611194a7b3af6a /addons/web/common/http.py
parent96cbcdcf2f3613b453fda9a4eaaac02090458a44 (diff)
[FIX] imports to handle conflicts with e.g. web.py in embedded mode
bzr revid: xmo@openerp.com-20120210103426-b20ass3mwx2ay9c4
Diffstat (limited to 'addons/web/common/http.py')
-rw-r--r--addons/web/common/http.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 7844e1038f8..a281cd003f1 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -25,9 +25,9 @@ import werkzeug.utils
import werkzeug.wrappers
import werkzeug.wsgi
-import nonliterals
-import session
-import openerplib
+from . import nonliterals
+from . import session
+from . import openerplib
__all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
'WebRequest', 'JsonRequest', 'HttpRequest']