diff options
| author | Stéphane Bidoul (ACSONE) <stephane.bidoul@acsone.eu> | 2017-09-17 16:44:02 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2017-09-18 16:05:31 +0200 |
| commit | 8bf06adc8d78c1bff8dc80ce53d6646e3ad22fff (patch) | |
| tree | 313f3a8dd72725092d9bea66b9de2116e459d471 /odoo/addons | |
| parent | 5d51950b59d63600f10990c085057326eee191c9 (diff) | |
[FIX] namespace packages: move from pkg_resources-style to pkg_util
Deprecates the previous pkg_resources-style packages. Our use was
not entirely spec compliant, and it broke with setuptools 31.
More information in https://github.com/odoo/odoo/pull/15718
Instead, use the pkgutil-style namespace packages.
This is spec compliant as long as all other distributions providing
odoo.addons use PEP 420 namespace packages (i.e. no __init__.py).
So this mechanism fully works on Python 3 only, but does not break
anything on Python 2.
See also:
https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages
Closes #19517
Fixes #15718
Diffstat (limited to 'odoo/addons')
| -rw-r--r-- | odoo/addons/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/odoo/addons/__init__.py b/odoo/addons/__init__.py index d3a3e7e9ba2..c0058937588 100644 --- a/odoo/addons/__init__.py +++ b/odoo/addons/__init__.py @@ -14,4 +14,7 @@ This module also conveniently reexports some symbols from odoo.modules. Importing them from here is deprecated. """ -__import__('pkg_resources').declare_namespace(__name__) +# make odoo.addons a namespace package, while keeping this __init__.py +# present, for python 2 compatibility +# https://packaging.python.org/guides/packaging-namespace-packages/ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) |