[FIX] replace simplejson dependency with json

pull/3071/head
Nikos Tsirintanis 2019-07-10 10:57:57 +02:00 committed by Jose Zambudio
parent ae2edfc3fc
commit 95ae813886
3 changed files with 8 additions and 12 deletions

View File

@ -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',
],
},
}

View File

@ -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 <stefano.consolaro@mymage.it>\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

View File

@ -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)