Merge pull request #279 from yelizariev/11.0-fix-simplejson

commit is created by 👷‍♂️ Merge Bot: https://odoo-devops.readthedocs.io/en/latest/git/github-merge-bot.html

.isort.cfg

@@ -9,4 +9,4 @@ line_length=88
 known_odoo=odoo
 known_odoo_addons=odoo.addons
 sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
-known_third_party=requests,simplejson
+known_third_party=requests

mail_private/tests/test_js.py

@@ -22,7 +22,9 @@ class TestUi(odoo.tests.HttpCase):
 
         env = Environment(self.registry.test_cr, self.uid, {})
         partners = env["res.partner"].search([])
-        new_follower = env["res.partner"].search([("name", "ilike", "Ja")])
+        new_follower = env["res.partner"].search(
+            [("name", "ilike", "Ja"), ("email", "!=", False)]
+        )
         for partner in partners:
             partner.message_subscribe(new_follower.ids, [])
 

mailgun/models/ir_config_parameter.py

@@ -1,10 +1,15 @@
 import logging
 
 import requests
-import simplejson
 
 from odoo import api, models
 
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+
 _logger = logging.getLogger(__name__)
 
 
@@ -23,6 +28,6 @@ class IrConfigParameter(models.Model):
             res = requests.put(url, auth=("api", api_key))
             if (
                 res.status_code == 200
-                and simplejson.loads(res.text)["domain"]["state"] == "active"
+                and json.loads(res.text)["domain"]["state"] == "active"
             ):
                 self.sudo().set_param("mailgun.verified", "1")