From efb5d31f00669b03cb39669158a39fbc2c3ade4f Mon Sep 17 00:00:00 2001 From: Nikos Tsirintanis Date: Wed, 10 Jul 2019 10:57:57 +0200 Subject: [PATCH 1/2] [FIX] replace simplejson dependency with json --- fetchmail_attach_from_folder/__manifest__.py | 5 ----- fetchmail_attach_from_folder/models/fetchmail_server.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/fetchmail_attach_from_folder/__manifest__.py b/fetchmail_attach_from_folder/__manifest__.py index 49b5373f6..27937f3ad 100644 --- a/fetchmail_attach_from_folder/__manifest__.py +++ b/fetchmail_attach_from_folder/__manifest__.py @@ -17,9 +17,4 @@ ], 'installable': True, 'auto_install': False, - 'external_dependencies': { - 'python': [ - 'simplejson', - ], - }, } 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) From beb96b49da0d50ef3983e6288ecce1d559c1a456 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 15 Jul 2019 10:20:44 +0000 Subject: [PATCH 2/2] fetchmail_attach_from_folder 10.0.1.1.0 --- fetchmail_attach_from_folder/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fetchmail_attach_from_folder/__manifest__.py b/fetchmail_attach_from_folder/__manifest__.py index 27937f3ad..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',