Browse Source

[9.0][report_custom_filename] Remove simplejson dependency.

Currently this dependency was not listed under `external_dependencies`, and violates https://github.com/OCA/maintainer-quality-tools/pull/354, which leads to `ImportError` under some environments.

Since it adds no benefit over Python's core `json` implementation, I'm simply removing the dependency.
pull/88/head
Jairo Llopis 8 years ago
parent
commit
73c945758c
  1. 1
      report_custom_filename/README.rst
  2. 4
      report_custom_filename/controllers/reports.py

1
report_custom_filename/README.rst

@ -27,6 +27,7 @@ Contributors
------------ ------------
* Holger Brunn <hbrunn@therp.nl> * Holger Brunn <hbrunn@therp.nl>
* Jairo Llopis <jairo.llopis@tecnativa.com>
Icon Icon
---- ----

4
report_custom_filename/controllers/reports.py

@ -2,7 +2,7 @@
# Copyright 2014 Therp BV (<http://therp.nl>). # Copyright 2014 Therp BV (<http://therp.nl>).
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import simplejson
import json
from openerp import http from openerp import http
from openerp.addons.web.controllers import main from openerp.addons.web.controllers import main
from openerp.addons.mail.models import mail_template from openerp.addons.mail.models import mail_template
@ -13,7 +13,7 @@ class Reports(main.Reports):
@main.serialize_exception @main.serialize_exception
def index(self, action, token): def index(self, action, token):
result = super(Reports, self).index(action, token) result = super(Reports, self).index(action, token)
action = simplejson.loads(action)
action = json.loads(action)
context = dict(http.request.context) context = dict(http.request.context)
context.update(action["context"]) context.update(action["context"])
report_xml = http.request.session.model('ir.actions.report.xml') report_xml = http.request.session.model('ir.actions.report.xml')

Loading…
Cancel
Save