From b9fbf248aa9ddf027f6a7d7e5daa5d1efc08aa75 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 10 Feb 2012 11:35:11 +0100
Subject: [PATCH] [FIX] auth_openid, edi: fix web imports to correctly handle
 conflicts with e.g. web.py

bzr revid: xmo@openerp.com-20120210103511-ak08gis9h35j8pe2
---
 addons/auth_openid/controllers/main.py |  5 ++++-
 addons/edi/controllers/main.py         | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index c95189b7736..af30566a643 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -28,7 +28,10 @@ import werkzeug.urls
 import werkzeug.exceptions
 
 from openerp.modules.registry import RegistryManager
-import web.common.http as openerpweb
+try:
+    import openerp.addons.web.common.http as openerpweb
+except ImportError:
+    import web.common.http as openerpweb
 
 from openid import oidutil
 from openid.store import memstore
diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
index fef91df3d54..1de3ff8ae63 100644
--- a/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@ -4,8 +4,14 @@ import textwrap
 import simplejson
 import werkzeug.wrappers
 
-import web.common.http as openerpweb
-import web.controllers.main
+try:
+    # embedded
+    import openerp.addons.web.common.http as openerpweb
+    import openerp.addons.web.controllers.main as webmain
+except ImportError:
+    # standalone
+    import web.common.http as openerpweb
+    import web.controllers.main as webmain
 
 class EDI(openerpweb.Controller):
     # http://hostname:8069/edi/view?db=XXXX&token=XXXXXXXXXXX
@@ -24,14 +30,14 @@ class EDI(openerpweb.Controller):
     def view(self, req, db, token):
         d = self.template(req)
         d["init"] = 's.edi.edi_view("%s","%s");'%(db,token)
-        r = web.controllers.main.html_template % d
+        r = webmain.html_template % d
         return r
 
     @openerpweb.httprequest
     def import_url(self, req, url):
         d = self.template(req)
         d["init"] = 's.edi.edi_import("%s");'%(url)
-        r = web.controllers.main.html_template % d
+        r = webmain.html_template % d
         return r
 
     @openerpweb.httprequest
@@ -78,7 +84,7 @@ class EDI(openerpweb.Controller):
     def import_edi_url(self, req, url):
         result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url)
         if len(result) == 1:
-            return {"action": web.controllers.main.clean_action(req, result[0][2])}
+            return {"action": webmain.clean_action(req, result[0][2])}
         return True
 
 #