diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-02-10 11:34:26 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-02-10 11:34:26 +0100 |
| commit | af8864d571bdaf0b87a63ca6fa0a4fb5ea5c36f0 (patch) | |
| tree | 5d6c384d5e5e7cb90a1ec20bae611194a7b3af6a /addons/web_dashboard/controllers.py | |
| parent | 96cbcdcf2f3613b453fda9a4eaaac02090458a44 (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_dashboard/controllers.py')
| -rw-r--r-- | addons/web_dashboard/controllers.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/web_dashboard/controllers.py b/addons/web_dashboard/controllers.py index 0f6ae5dad7d..f7af6180e41 100644 --- a/addons/web_dashboard/controllers.py +++ b/addons/web_dashboard/controllers.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- -import web.common.http as openerpweb +try: + import openerp.addons.web.common.http as openerpweb +except ImportError: + import web.common.http as openerpweb WIDGET_CONTENT_PATTERN = """<!DOCTYPE html> <html> |