diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-02-10 11:35:11 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-02-10 11:35:11 +0100 |
| commit | b9fbf248aa9ddf027f6a7d7e5daa5d1efc08aa75 (patch) | |
| tree | e4f2d5ab4e7da1e659861bd017d7ad2c4157935a /addons/auth_openid/controllers | |
| parent | af8864d571bdaf0b87a63ca6fa0a4fb5ea5c36f0 (diff) | |
[FIX] auth_openid, edi: fix web imports to correctly handle conflicts with e.g. web.py
bzr revid: xmo@openerp.com-20120210103511-ak08gis9h35j8pe2
Diffstat (limited to 'addons/auth_openid/controllers')
| -rw-r--r-- | addons/auth_openid/controllers/main.py | 5 |
1 files changed, 4 insertions, 1 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 |