diff options
| author | xmo-odoo <xmo@odoo.com> | 2017-04-28 09:06:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 09:06:53 +0200 |
| commit | b4429c2a91889bf60b56e0c7909c844d357363f7 (patch) | |
| tree | 1ae879a60a34454b4a93425f0ebe7d5ccd029c03 /addons/base_import | |
| parent | c5579ef89e2a595893d0959bef6fddfdbfb6d697 (diff) | |
[FIX] Various P3-related import changes
* LDAP import: python-ldap is not python3-compatible, pyldap is
Warning: only supported from debian Stretch (current testing)?
https://packages.debian.org/search?searchon=names&keywords=pyldap
* implicitly relative imports
* imports of moved or removed stdlib modules
issue #8530
Diffstat (limited to 'addons/base_import')
| -rw-r--r-- | addons/base_import/__init__.py | 4 | ||||
| -rw-r--r-- | addons/base_import/controllers/__init__.py | 2 | ||||
| -rw-r--r-- | addons/base_import/models/__init__.py | 4 | ||||
| -rw-r--r-- | addons/base_import/models/base_import.py | 2 | ||||
| -rw-r--r-- | addons/base_import/tests/__init__.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/addons/base_import/__init__.py b/addons/base_import/__init__.py index ac0011716f6..7d34c7c054a 100644 --- a/addons/base_import/__init__.py +++ b/addons/base_import/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import controllers -import models +from . import controllers +from . import models diff --git a/addons/base_import/controllers/__init__.py b/addons/base_import/controllers/__init__.py index f48716d3a69..5d4b25db9c0 100644 --- a/addons/base_import/controllers/__init__.py +++ b/addons/base_import/controllers/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import main +from . import main diff --git a/addons/base_import/models/__init__.py b/addons/base_import/models/__init__.py index 0c98d751b68..f349a3caea0 100644 --- a/addons/base_import/models/__init__.py +++ b/addons/base_import/models/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import base_import -import test_models +from . import base_import +from . import test_models diff --git a/addons/base_import/models/base_import.py b/addons/base_import/models/base_import.py index 334b09846eb..996b91b0349 100644 --- a/addons/base_import/models/base_import.py +++ b/addons/base_import/models/base_import.py @@ -37,7 +37,7 @@ except ImportError: xlrd = xlsx = None try: - import odf_ods_reader + from . import odf_ods_reader except ImportError: odf_ods_reader = None diff --git a/addons/base_import/tests/__init__.py b/addons/base_import/tests/__init__.py index cdc1b5d8187..1b9a63683a8 100644 --- a/addons/base_import/tests/__init__.py +++ b/addons/base_import/tests/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import test_base_import +from . import test_base_import |