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/common | |
| 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/common')
| -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 |
4 files changed, 10 insertions, 10 deletions
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__) #---------------------------------------------------------- |