← Back to branch summary

~openerp-dev/openerp-web/trunk-web_pdf_viewer-pga

« back to all changes in this revision

Viewing changes to addons/web_diagram/controllers/main.py

  • Committer: Xavier Morel
  • Date: 2012-02-10 10:34:26 UTC
  • Revision ID: xmo@openerp.com-20120210103426-b20ass3mwx2ay9c4
[FIX] imports to handle conflicts with e.g. web.py in embedded mode

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web_diagram/controllers/main.py
1
 
import web.common.http as openerpweb
2
 
from web.controllers.main import View
 
1
try:
 
2
    # embedded
 
3
    import openerp.addons.web.common.http as openerpweb
 
4
    from openerp.addons.web.controllers.main import View
 
5
except ImportError:
 
6
    # standalone
 
7
    import web.common.http as openerpweb
 
8
    from web.controllers.main import View
3
9
 
4
10
class DiagramView(View):
5
11
    _cp_path = "/web_diagram/diagram"