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 /odoo/addons/base/module/wizard | |
| 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 'odoo/addons/base/module/wizard')
| -rw-r--r-- | odoo/addons/base/module/wizard/__init__.py | 14 | ||||
| -rw-r--r-- | odoo/addons/base/module/wizard/base_export_language.py | 4 | ||||
| -rw-r--r-- | odoo/addons/base/module/wizard/base_update_translations.py | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/odoo/addons/base/module/wizard/__init__.py b/odoo/addons/base/module/wizard/__init__.py index 35d85e5e002..a0d693f948d 100644 --- a/odoo/addons/base/module/wizard/__init__.py +++ b/odoo/addons/base/module/wizard/__init__.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import base_module_update -import base_language_install -import base_import_language -import base_module_upgrade -import base_module_configuration -import base_export_language -import base_update_translations +from . import base_module_update +from . import base_language_install +from . import base_import_language +from . import base_module_upgrade +from . import base_module_configuration +from . import base_export_language +from . import base_update_translations diff --git a/odoo/addons/base/module/wizard/base_export_language.py b/odoo/addons/base/module/wizard/base_export_language.py index cd19222af14..50c57bb870e 100644 --- a/odoo/addons/base/module/wizard/base_export_language.py +++ b/odoo/addons/base/module/wizard/base_export_language.py @@ -3,7 +3,7 @@ import base64 import contextlib -import cStringIO +import io from odoo import api, fields, models, tools, _ @@ -34,7 +34,7 @@ class BaseLanguageExport(models.TransientModel): lang = this.lang if this.lang != NEW_LANG_KEY else False mods = sorted(this.mapped('modules.name')) or ['all'] - with contextlib.closing(cStringIO.StringIO()) as buf: + with contextlib.closing(io.BytesIO()) as buf: tools.trans_export(lang, mods, buf, this.format, self._cr) out = base64.encodestring(buf.getvalue()) diff --git a/odoo/addons/base/module/wizard/base_update_translations.py b/odoo/addons/base/module/wizard/base_update_translations.py index c5057a01fff..8f487dbbafe 100644 --- a/odoo/addons/base/module/wizard/base_update_translations.py +++ b/odoo/addons/base/module/wizard/base_update_translations.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. import contextlib -import cStringIO +import io from odoo import api, fields, models, tools, _ from odoo.exceptions import UserError @@ -37,7 +37,7 @@ class BaseUpdateTranslations(models.TransientModel): def act_update(self): this = self[0] lang_name = self._get_lang_name(this.lang) - with contextlib.closing(cStringIO.StringIO()) as buf: + with contextlib.closing(io.BytesIO()) as buf: tools.trans_export(this.lang, ['all'], buf, 'csv', self._cr) tools.trans_load_data(self._cr, buf, 'csv', this.lang, lang_name=lang_name) return {'type': 'ir.actions.act_window_close'} |