Browse Source

[FIX] replace simplejson dependency with json

10.0
Nikos Tsirintanis 5 years ago
committed by OCA-git-bot
parent
commit
efb5d31f00
  1. 5
      fetchmail_attach_from_folder/__manifest__.py
  2. 4
      fetchmail_attach_from_folder/models/fetchmail_server.py

5
fetchmail_attach_from_folder/__manifest__.py

@ -17,9 +17,4 @@
], ],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,
'external_dependencies': {
'python': [
'simplejson',
],
},
} }

4
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). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
import logging import logging
import re import re
import simplejson
import json
from lxml import etree from lxml import etree
from odoo import _, api, fields, models from odoo import _, api, fields, models
@ -111,7 +111,7 @@ class FetchmailServer(models.Model):
nocopy=True) nocopy=True)
modifier_dict = modifiers[field.attrib['name']] modifier_dict = modifiers[field.attrib['name']]
combined_dict = dict(original_dict, **modifier_dict) 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 if (field.tag == 'field' and
field.get('name') == 'match_algorithm'): field.get('name') == 'match_algorithm'):
field.set('help', docstr) field.set('help', docstr)

Loading…
Cancel
Save