From 5700d89f248df4841a4683d30bc8c258a6e84b54 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 4 Mar 2019 16:09:29 +0100 Subject: [PATCH] [IMP] use json library instead of simplejson --- mail_sendgrid/__manifest__.py | 2 +- mail_sendgrid/controllers/json_request.py | 9 ++------- requirements.txt | 3 +-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/mail_sendgrid/__manifest__.py b/mail_sendgrid/__manifest__.py index 4e42d449..a6f5df32 100644 --- a/mail_sendgrid/__manifest__.py +++ b/mail_sendgrid/__manifest__.py @@ -20,6 +20,6 @@ 'installable': True, 'auto_install': False, 'external_dependencies': { - 'python': ['sendgrid', 'simplejson'], + 'python': ['sendgrid'], }, } diff --git a/mail_sendgrid/controllers/json_request.py b/mail_sendgrid/controllers/json_request.py index e2cd25bc..c54a4eab 100644 --- a/mail_sendgrid/controllers/json_request.py +++ b/mail_sendgrid/controllers/json_request.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Copyright 2016-2017 Compassion CH (http://www.compassion.ch) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +import json import logging from odoo.http import JsonRequest, Root, Response @@ -8,12 +9,6 @@ from odoo.http import JsonRequest, Root, Response old_get_request = Root.get_request _logger = logging.getLogger(__name__) -try: - import simplejson -except ImportError: - _logger.error("Please install simplejson tu use mail_sendgrid module") - _logger.debug("ImportError details:", exc_info=True) - def get_request(self, httprequest): if (httprequest.mimetype == "application/json" and @@ -45,7 +40,7 @@ class RESTJsonRequest(JsonRequest): response['result'] = result mime = 'application/json' - body = simplejson.dumps(response) + body = json.dumps(response) return Response( body, headers=[('Content-Type', mime), diff --git a/requirements.txt b/requirements.txt index ba72244b..94d9e9ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ premailer -simplejson -sendgrid \ No newline at end of file +sendgrid