From af8864d571bdaf0b87a63ca6fa0a4fb5ea5c36f0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 10 Feb 2012 11:34:26 +0100
Subject: [FIX] imports to handle conflicts with e.g. web.py in embedded mode

bzr revid: xmo@openerp.com-20120210103426-b20ass3mwx2ay9c4
---
 addons/web/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/web/__init__.py')

diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index 36dead8ab74..621931e9167 100644
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -1,7 +1,8 @@
-import common
-import controllers
 import logging
 
+from . import common
+from . import controllers
+
 _logger = logging.getLogger(__name__)
 
 class Options(object):
-- 
cgit v1.2.3