From 95ae813886216fa3196e03f359c58f9977164599 Mon Sep 17 00:00:00 2001 From: Nikos Tsirintanis Date: Wed, 10 Jul 2019 10:57:57 +0200 Subject: [PATCH] [FIX] replace simplejson dependency with json --- fetchmail_attach_from_folder/__manifest__.py | 7 +------ fetchmail_attach_from_folder/i18n/it.po | 9 +++++---- fetchmail_attach_from_folder/models/fetchmail_server.py | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/fetchmail_attach_from_folder/__manifest__.py b/fetchmail_attach_from_folder/__manifest__.py index 49b5373f6..232161dea 100644 --- a/fetchmail_attach_from_folder/__manifest__.py +++ b/fetchmail_attach_from_folder/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Email gateway - folders', 'summary': 'Attach mails in an IMAP folder to existing objects', - 'version': '10.0.1.0.0', + 'version': '10.0.1.1.0', 'author': 'Therp BV,Odoo Community Association (OCA)', 'website': 'http://www.therp.nl', 'license': 'AGPL-3', @@ -17,9 +17,4 @@ ], 'installable': True, 'auto_install': False, - 'external_dependencies': { - 'python': [ - 'simplejson', - ], - }, } diff --git a/fetchmail_attach_from_folder/i18n/it.po b/fetchmail_attach_from_folder/i18n/it.po index 33c44a8b5..3fe5b10a2 100644 --- a/fetchmail_attach_from_folder/i18n/it.po +++ b/fetchmail_attach_from_folder/i18n/it.po @@ -8,15 +8,16 @@ msgstr "" "Project-Id-Version: server-tools (8.0)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 11:14+0000\n" -"PO-Revision-Date: 2015-09-18 13:55+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2023-11-30 16:34+0000\n" +"Last-Translator: mymage \n" "Language-Team: Italian (http://www.transifex.com/oca/OCA-server-tools-8-0/" "language/it/)\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. module: fetchmail_attach_from_folder #: model:ir.model.fields,field_description:fetchmail_attach_from_folder.field_fetchmail_server_folder_active @@ -125,7 +126,7 @@ msgstr "" #. module: fetchmail_attach_from_folder #: model:ir.model.fields,field_description:fetchmail_attach_from_folder.field_fetchmail_server_folder_domain msgid "Domain" -msgstr "Domain" +msgstr "Dominio" #. module: fetchmail_attach_from_folder #: model:ir.model.fields,field_description:fetchmail_attach_from_folder.field_fetchmail_attach_mail_manually_mail_ids diff --git a/fetchmail_attach_from_folder/models/fetchmail_server.py b/fetchmail_attach_from_folder/models/fetchmail_server.py index 8d20dc66f..701719766 100644 --- a/fetchmail_attach_from_folder/models/fetchmail_server.py +++ b/fetchmail_attach_from_folder/models/fetchmail_server.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import logging import re -import simplejson +import json from lxml import etree from odoo import _, api, fields, models @@ -111,7 +111,7 @@ class FetchmailServer(models.Model): nocopy=True) modifier_dict = modifiers[field.attrib['name']] combined_dict = dict(original_dict, **modifier_dict) - field.set('modifiers', simplejson.dumps(combined_dict)) + field.set('modifiers', json.dumps(combined_dict)) if (field.tag == 'field' and field.get('name') == 'match_algorithm'): field.set('help', docstr)