odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] imports to handle conflicts with e.g. web.py in embedded mode 

bzr revid: xmo@openerp.com-20120210103426-b20ass3mwx2ay9c4
This commit is contained in:
Xavier Morel 2012-02-10 11:34:26 +01:00
parent 96cbcdcf2f
commit af8864d571
10 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web/__init__.py
View File

@ -1,7 +1,8 @@
import common
import controllers
import logging
from . import common
from . import controllers
_logger = logging.getLogger(__name__)
class Options(object):

10
addons/web/common/__init__.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python
import http
import nonliterals
import release
import session
import xml2json
from . import http
from . import nonliterals
from . import release
from . import session
from . import xml2json

6
addons/web/common/http.py
View File

@ -25,9 +25,9 @@ import werkzeug.utils
import werkzeug.wrappers
import werkzeug.wsgi
import nonliterals
import session
import openerplib
from . import nonliterals
from . import session
from . import openerplib
__all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
'WebRequest', 'JsonRequest', 'HttpRequest']

2
addons/web/common/openerplib/__init__.py
View File

@ -28,5 +28,5 @@
#
##############################################################################
from main import *
from .main import *

2
addons/web/common/session.py
View File

@ -6,7 +6,7 @@ import logging
import time
import openerplib
import nonliterals
from . import nonliterals
_logger = logging.getLogger(__name__)
#----------------------------------------------------------

2
addons/web/controllers/__init__.py
View File

@ -1 +1 @@
import main
from . import main

5
addons/web_dashboard/controllers.py
View File

@ -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>

2
addons/web_diagram/__init__.py
View File

@ -1 +1 @@
import controllers
from . import controllers

2
addons/web_diagram/controllers/__init__.py
View File

@ -1 +1 @@
import main
from . import main

10
addons/web_diagram/controllers/main.py
View File

@ -1,5 +1,11 @@
import web.common.http as openerpweb
from web.controllers.main import View
try:
# embedded
import openerp.addons.web.common.http as openerpweb
from openerp.addons.web.controllers.main import View
except ImportError:
# standalone
import web.common.http as openerpweb
from web.controllers.main import View
class DiagramView(View):
_cp_path = "/web_diagram/diagram"