Browse Source

Merge pull request #278 from yelizariev/fix-simplejson

commit is created by 👷‍♂️ Merge Bot: https://odoo-devops.readthedocs.io/en/latest/git/github-merge-bot.html
pull/283/head
Mitchell Admin 5 years ago
committed by GitHub
parent
commit
13ba4bc4db
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .isort.cfg
  2. 8
      mailgun/models.py

2
.isort.cfg

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

8
mailgun/models.py

@ -2,9 +2,13 @@
import logging import logging
import requests import requests
import simplejson
from openerp import api, models from openerp import api, models
try:
import simplejson as json
except ImportError:
import json
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@ -38,6 +42,6 @@ class IrConfigParameter(models.Model):
res = requests.put(url, auth=("api", api_key)) res = requests.put(url, auth=("api", api_key))
if ( if (
res.status_code == 200 res.status_code == 200
and simplejson.loads(res.text)["domain"]["state"] == "active"
and json.loads(res.text)["domain"]["state"] == "active"
): ):
self.set_param("mailgun.verified", "1") self.set_param("mailgun.verified", "1")
Loading…
Cancel
Save