diff options
| -rw-r--r-- | addons/web/__init__.py | 5 | ||||
| -rw-r--r-- | addons/web/common/__init__.py | 10 | ||||
| -rw-r--r-- | addons/web/common/http.py | 6 | ||||
| -rw-r--r-- | addons/web/common/openerplib/__init__.py | 2 | ||||
| -rw-r--r-- | addons/web/common/session.py | 2 | ||||
| -rw-r--r-- | addons/web/controllers/__init__.py | 2 | ||||
| -rw-r--r-- | addons/web_dashboard/controllers.py | 5 | ||||
| -rw-r--r-- | addons/web_diagram/__init__.py | 2 | ||||
| -rw-r--r-- | addons/web_diagram/controllers/__init__.py | 2 | ||||
| -rw-r--r-- | addons/web_diagram/controllers/main.py | 10 |
10 files changed, 28 insertions, 18 deletions
diff --git a/addons/web/__init__.py b/addons/web/__init__.py index 36dead8ab74..621931e9167 100644 --- 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 53bf3e3ed08..4060be2f87e 100644 --- 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 7844e1038f8..a281cd003f1 100644 --- 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 5c0bd8ec655..44701ec22fe 100644 --- 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 a6dec5b9976..58ef83ad754 100644 --- 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/controllers/__init__.py b/addons/web/controllers/__init__.py index 8ee9bae18d9..12a7e529b67 100644 --- a/addons/web/controllers/__init__.py +++ b/addons/web/controllers/__init__.py @@ -1 +1 @@ -import main +from . import main 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> diff --git a/addons/web_diagram/__init__.py b/addons/web_diagram/__init__.py index 355939a4922..e046e49fbe2 100644 --- 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 039d9715fab..12a7e529b67 100644 --- 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 28f31ac0c19..95cd9af6e85 100644 --- 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" |