projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 96cbcdc)
[FIX] imports to handle conflicts with e.g. web.py in embedded mode
authorXavier Morel <xmo@openerp.com>
Fri, 10 Feb 2012 10:34:26 +0000 (11:34 +0100)
committerXavier Morel <xmo@openerp.com>
Fri, 10 Feb 2012 10:34:26 +0000 (11:34 +0100)
bzr revid: xmo@openerp.com-20120210103426-b20ass3mwx2ay9c4

addons/web/__init__.py patch | blob | history
addons/web/common/__init__.py patch | blob | history
addons/web/common/http.py patch | blob | history
addons/web/common/openerplib/__init__.py patch | blob | history
addons/web/common/session.py patch | blob | history
addons/web/controllers/__init__.py patch | blob | history
addons/web_dashboard/controllers.py patch | blob | history
addons/web_diagram/__init__.py patch | blob | history
addons/web_diagram/controllers/__init__.py patch | blob | history
addons/web_diagram/controllers/main.py patch | blob | history

diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index 36dead8..621931e 100644 (file)
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -1,7 +1,8 @@
-import common
-import controllers
 import logging
 
+from . import common
+from . import controllers
+
 _logger = logging.getLogger(__name__)
 
 class Options(object):
diff --git a/addons/web/common/__init__.py b/addons/web/common/__init__.py
index 53bf3e3..4060be2 100644 (file)
--- a/addons/web/common/__init__.py
+++ b/addons/web/common/__init__.py
@@ -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
diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 7844e10..a281cd0 100644 (file)
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -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']
diff --git a/addons/web/common/openerplib/__init__.py b/addons/web/common/openerplib/__init__.py
index 5c0bd8e..44701ec 100644 (file)
--- a/addons/web/common/openerplib/__init__.py
+++ b/addons/web/common/openerplib/__init__.py
@@ -28,5 +28,5 @@
 # 
 ##############################################################################
 
-from main import *
+from .main import *
 
diff --git a/addons/web/common/session.py b/addons/web/common/session.py
index a6dec5b..58ef83a 100644 (file)
--- a/addons/web/common/session.py
+++ b/addons/web/common/session.py
@@ -6,7 +6,7 @@ import logging
 import time
 import openerplib
 
-import nonliterals
+from . import nonliterals
 
 _logger = logging.getLogger(__name__)
 #----------------------------------------------------------
diff --git a/addons/web_dashboard/controllers.py b/addons/web_dashboard/controllers.py
index 0f6ae5d..f7af618 100644 (file)
--- 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>
diff --git a/addons/web_diagram/__init__.py b/addons/web_diagram/__init__.py
index 355939a..e046e49 100644 (file)
--- a/addons/web_diagram/__init__.py
+++ b/addons/web_diagram/__init__.py
@@ -1 +1 @@
-import controllers
\ No newline at end of file
+from . import controllers
diff --git a/addons/web_diagram/controllers/__init__.py b/addons/web_diagram/controllers/__init__.py
index 039d971..12a7e52 100644 (file)
--- a/addons/web_diagram/controllers/__init__.py
+++ b/addons/web_diagram/controllers/__init__.py
@@ -1 +1 @@
-import main
\ No newline at end of file
+from . import main
diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py
index 28f31ac..95cd9af 100644 (file)
--- a/addons/web_diagram/controllers/main.py
+++ b/addons/web_diagram/controllers/main.py
@@ -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"
Unnamed repository; edit this file 'description' to name the repository.