Merge PR #1621 into 10.0

Signed-off-by pedrobaeza

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

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)