Skip to content
Snippets Groups Projects
Commit 62eb3b73a373 authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

:shirt: pylint

parent 3c420831e804
No related branches found
No related tags found
1 merge request!19forward port of 11.0 features
Hide whitespace changes
Inline Side-by-side
controllers/main.py
+ 2
− 2
View file @ 62eb3b73
......@@ -17,7 +17,7 @@
@route()
def report_routes(self, reportname, docids=None, converter=None, **data):
if converter != "redner":
return super(ReportController, self).report_routes(
return super().report_routes(
reportname=reportname,
docids=docids,
converter=converter,
......@@ -72,7 +72,7 @@
requestcontent = json.loads(data)
url, report_type = requestcontent[0], requestcontent[1]
if "redner" not in report_type:
return super(ReportController, self).report_download(data, token)
return super().report_download(data, token)
try:
reportname = url.split("/report/redner/")[1].split("?")[0]
docids = None
......
models/ir_actions_report.py
+ 3
− 3
View file @ 62eb3b73
......@@ -6,7 +6,7 @@
from odoo.exceptions import AccessError, ValidationError
from odoo.tools.safe_eval import safe_eval
from odoo.addons.redner.utils.formats import Formats
from ..utils.formats import Formats
_logger = logging.getLogger(__name__)
......@@ -197,8 +197,8 @@
save_in_attachment = {}
if res_ids:
# Dispatch the records by ones having an attachment
Model = self.env[self.model]
record_ids = Model.browse(res_ids)
model = self.env[self.model]
record_ids = model.browse(res_ids)
if self.attachment:
for record_id in record_ids:
attachment_id = self.retrieve_attachment(record_id)
......
models/mail_template.py
+ 5
− 7
View file @ 62eb3b73
......@@ -86,7 +86,7 @@
"We received an unexpected error from redner server. "
"Please contact your administrator"
)
)
) from e
values["body_html"] = (
base64.b64decode(res[0]["body"]).decode("utf-8") if res else ""
)
......@@ -97,9 +97,7 @@
def generate_email(self, res_ids, fields=None):
self.ensure_one()
results = super(MailTemplate, self).generate_email(
res_ids, fields=fields
)
results = super().generate_email(res_ids, fields=fields)
if not self.is_redner_template:
return results
......@@ -116,5 +114,5 @@
return self._patch_email_values(results, res_ids[0])
def render_variable_hook(self, variables):
""" Override to add additional variables in mail "render template" func
"""Override to add additional variables in mail "render template" func
"""
......@@ -120,3 +118,3 @@
"""
variables.update({"image": lambda value: image(value)})
return super(MailTemplate, self).render_variable_hook(variables)
variables.update({"image": image})
return super().render_variable_hook(variables)
models/redner_report.py
+ 5
− 6
View file @ 62eb3b73
......@@ -14,8 +14,8 @@
from odoo import _, api, fields, models
from odoo.exceptions import ValidationError
from odoo.addons.redner.utils import formats
from odoo.addons.redner.utils.formats import Formats
from ..utils import formats
from ..utils.formats import Formats
logger = logging.getLogger(__name__)
......@@ -75,7 +75,7 @@
"We received an unexpected error from redner server. "
"Please contact your administrator"
)
)
) from e
content = base64.b64decode(res[0]["body"])
with open(report_file, "wb") as f:
......@@ -90,7 +90,7 @@
self.ensure_one()
attachment = existing_reports_attachment.get(model_instance.id)
if attachment and self.ir_actions_report_id.attachment_use:
content = base64.decodestring(attachment.datas)
content = base64.decodebytes(attachment.datas)
report_file = tempfile.mktemp(
"." + self.ir_actions_report_id.redner_filetype
)
......@@ -142,8 +142,7 @@
return reports_path[0], filetype
if filetype == formats.FORMAT_PDF:
return self._merge_pdf(reports_path), formats.FORMAT_PDF
else:
return self._zip_results(reports_path), "zip"
return self._zip_results(reports_path), "zip"
@api.model
def _cleanup_tempfiles(self, temporary_files):
......
models/redner_template.py
+ 11
− 9
View file @ 62eb3b73
......@@ -47,7 +47,7 @@
)
language = fields.Selection(
string=_("Language"),
string="Language",
selection=[("mustache", "mustache"), ("od+mustache", "od+mustache")],
default="mustache",
required=True,
......@@ -118,7 +118,7 @@
version=fields.Date.to_string(fields.Datetime.now()),
)
return super(RednerTemplate, self).create(vals)
return super().create(vals)
def write(self, vals):
"""Overwrite write to update redner template"""
......@@ -134,7 +134,7 @@
redner_id = self.redner_id
vals["redner_id"] = vals["name"]
ret = super(RednerTemplate, self).write(vals)
ret = super().write(vals)
for record in self:
try:
body, body_format = (
......@@ -156,5 +156,5 @@
version=fields.Date.to_string(record.write_date),
)
except Exception as e:
logger.error("Failed to update redner template :%s" % e)
logger.error("Failed to update redner template :%s", e)
raise ValidationError(
......@@ -160,6 +160,6 @@
raise ValidationError(
_("Failed to update render template, %s" % e)
)
_("Failed to update render template, %s") % e
) from e
return ret
def unlink(self):
......@@ -172,8 +172,8 @@
except Exception:
pass
return super(RednerTemplate, self).unlink()
return super().unlink()
def copy(self, default=None):
self.ensure_one()
default = dict(default or {}, name=_("%s (copy)") % self.name)
......@@ -176,8 +176,8 @@
def copy(self, default=None):
self.ensure_one()
default = dict(default or {}, name=_("%s (copy)") % self.name)
return super(RednerTemplate, self).copy(default)
return super().copy(default)
@api.depends("body", "template_data")
def _compute_keywords(self):
......@@ -212,7 +212,9 @@
)
except Exception as e:
logger.warning("Failed to fetch account template varlist :%s" % e)
logger.warning(
("Failed to fetch account template varlist :%s") % e
)
return []
def send_to_rednerd_server(self):
......
redner.py
+ 12
− 11
View file @ 62eb3b73
......@@ -3,6 +3,7 @@
import requests
from odoo import _
from odoo.exceptions import ValidationError
try:
......@@ -11,6 +12,6 @@
from urlparse import urljoin
logger = logging.getLogger(__name__)
_logger = logging.getLogger(__name__)
......@@ -15,6 +16,6 @@
class Redner(object):
class Redner:
def __init__(self, api_key, server_url, account, timeout):
"""Initialize the API client
......@@ -44,7 +45,7 @@
return self.call_impl(path, http_verb=http_verb, **params)
except Exception as error:
if retry_counter == MAX_REDNERD_TRIES - 1:
logger.error("Redner error: %s", str(error))
_logger.error("Redner error: %s", str(error))
raise error
def call_impl(self, path, http_verb="post", **params):
......@@ -68,8 +69,8 @@
url = urljoin(self.server_url, path)
_http_verb = http_verb.upper()
logger.info("Redner: Calling %s...", _http_verb)
logger.debug("Redner: Sending to %s > %s", url, params)
_logger.info("Redner: Calling %s...", _http_verb)
_logger.debug("Redner: Sending to %s > %s", url, params)
start = time.time()
r = getattr(self.session, http_verb, "post")(
......@@ -80,8 +81,8 @@
)
complete_time = time.time() - start
logger.info(
_logger.info(
"Redner: Received %s in %.2fms.",
r.status_code,
complete_time * 1000,
)
......@@ -84,8 +85,8 @@
"Redner: Received %s in %.2fms.",
r.status_code,
complete_time * 1000,
)
logger.debug("Redner: Received %s", r.text)
_logger.debug("Redner: Received %s", r.text)
try:
response = r.json()
......@@ -95,8 +96,8 @@
response = r.text
if not str(r.status_code).startswith("2"):
logger.error("Bad response from Redner: %s" % response)
raise ValidationError("Unexpected redner error: %r" % response)
_logger.error("Bad response from Redner: %s", response)
raise ValidationError(_("Unexpected redner error: %r") % response)
return r.json()
......@@ -104,10 +105,10 @@
"""Try to establish a connection to server"""
conn = self.session.get(self.server_url, timeout=self.timeout)
if conn.status_code != requests.codes.ok:
raise ValidationError("Cannot Establish a connection to server")
raise ValidationError(_("Cannot Establish a connection to server"))
return conn
def __repr__(self):
return "<Redner %s>" % self.api_key
......@@ -108,10 +109,10 @@
return conn
def __repr__(self):
return "<Redner %s>" % self.api_key
class Templates(object):
class Templates:
def __init__(self, master):
self.master = master
......
utils/formats.py
+ 3
− 6
View file @ 62eb3b73
# -*- coding: utf-8 -*-
DEFAULT_MIMETYPE = "application/octet-stream"
FORMAT_WORD97 = "doc"
......@@ -17,7 +15,7 @@
pass
class Format(object):
class Format:
"""A format representation that contains:
a name we use in our applications
an ODF name (like: 'MS Word 2003 XML') which is the name you must
......@@ -36,7 +34,7 @@
self.native = native
class Formats(object):
class Formats:
def __init__(self):
self._formats = {
......@@ -108,5 +106,4 @@
"""
if nativeonly:
return [f for f in self._formats if self.get_format(f).native]
else:
return [f for f in self._formats]
return list(self._formats)
views/menu.xml
+ 9
− 11
View file @ 62eb3b73
<odoo>
<data>
......@@ -3,6 +2,6 @@
<!--Setting > Redner -->
<menuitem id="redner_menu"
name="Redner"
parent="base.menu_custom" />
<!--Setting > Redner -->
<menuitem id="redner_menu"
name="Redner"
parent="base.menu_custom" />
......@@ -8,8 +7,7 @@
<!--Setting > Redner > Templates-->
<menuitem name="Templates" id="redner_template_menu"
parent="redner_menu"
action="redner_template_action"
sequence="8" />
</data>
<!--Setting > Redner > Templates-->
<menuitem name="Templates" id="redner_template_menu"
parent="redner_menu"
action="redner_template_action"
sequence="8" />
</odoo>
\ No newline at end of file
views/redner_template_views.xml
+ 76
− 77
View file @ 62eb3b73
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="redner_template_view_search" model="ir.ui.view">
<field name="name">redner.template.search</field>
<field name="model">redner.template</field>
<field name="arch" type="xml">
<search string="Redner">
<filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
</search>
</field>
</record>
<record id="redner_template_view_search" model="ir.ui.view">
<field name="name">redner.template.search</field>
<field name="model">redner.template</field>
<field name="arch" type="xml">
<search string="Redner">
<filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
</search>
</field>
</record>
<record id="redner_template_view_tree" model="ir.ui.view">
<field name="name">redner.template.tree</field>
<field name="model">redner.template</field>
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="language"/>
<field name="detected_keywords"/>
</tree>
</field>
</record>
......@@ -13,13 +24,16 @@
<record id="redner_template_view_tree" model="ir.ui.view">
<field name="name">redner.template.tree</field>
<field name="model">redner.template</field>
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="language"/>
<field name="detected_keywords"/>
</tree>
</field>
</record>
<record id="redner_template_view_form" model="ir.ui.view">
<field name="name">redner.template.form</field>
<field name="model">redner.template</field>
<field name="arch" type="xml">
<form string="Rednerd Template">
<sheet>
<div class="oe_button_box" name="button_box">
<button name="toggle_active" type="object"
class="oe_stat_button" icon="fa-archive">
<field name="active" widget="boolean_button"
options='{"terminology": "archive"}'/>
</button>
</div>
......@@ -25,8 +39,10 @@
<record id="redner_template_view_form" model="ir.ui.view">
<field name="name">redner.template.form</field>
<field name="model">redner.template</field>
<field name="arch" type="xml">
<form string="Rednerd Template">
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group>
<field name="language"/>
<field name="detected_keywords"/>
</group>
</div>
......@@ -32,13 +48,7 @@
<div class="oe_button_box" name="button_box">
<button name="toggle_active" type="object"
class="oe_stat_button" icon="fa-archive">
<field name="active" widget="boolean_button"
options='{"terminology": "archive"}'/>
</button>
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<notebook>
<page string="Template Body" attrs="{'invisible': [('language', '=', 'od+mustache')]}">
<field name="body" widget="ace" attrs="{'required': [('language', '!=', 'od+mustache')]}"/>
</page>
<page string="Template Libreoffice" attrs="{'invisible': [('language', '!=', 'od+mustache')]}">
<group>
......@@ -44,4 +54,3 @@
<group>
<field name="language"/>
<field name="detected_keywords"/>
<field name="template_data" filename="name" nolabel="1" />
</group>
......@@ -47,3 +56,10 @@
</group>
</div>
</page>
<page string="Settings">
<group>
<field name="produces" />
<field name="locale_id" />
</group>
</page>
</notebook>
......@@ -49,18 +65,6 @@
<notebook>
<page string="Template Body" attrs="{'invisible': [('language', '=', 'od+mustache')]}">
<field name="body" widget="ace" attrs="{'required': [('language', '!=', 'od+mustache')]}"/>
</page>
<page string="Template Libreoffice" attrs="{'invisible': [('language', '!=', 'od+mustache')]}">
<group>
<field name="template_data" filename="name" nolabel="1" />
</group>
</page>
<page string="Settings">
<group>
<field name="produces" />
<field name="locale_id" />
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
......@@ -66,12 +70,7 @@
</sheet>
</form>
</field>
</record>
<record id="redner_template_action" model="ir.actions.act_window">
<field name="name">Redner Templates</field>
<field name="res_model">redner.template</field>
<field name="view_mode">tree,form</field>
</record>
<record id="redner_template_action" model="ir.actions.act_window">
<field name="name">Redner Templates</field>
<field name="res_model">redner.template</field>
<field name="view_mode">tree,form</field>
</record>
......@@ -77,11 +76,11 @@
<!-- Set up an action to send multiple templates to the redner server. -->
<record id="send_to_rednerd_server_action" model="ir.actions.server">
<field name="binding_model_id" ref="model_redner_template" />
<field name="code">records.send_to_rednerd_server()</field>
<field name="model_id" ref="model_redner_template" />
<field name="name">Send to rednerd server</field>
<field name="state">code</field>
<field name="type">ir.actions.server</field>
</record>
<!-- Set up an action to send multiple templates to the redner server. -->
<record id="send_to_rednerd_server_action" model="ir.actions.server">
<field name="binding_model_id" ref="model_redner_template" />
<field name="code">records.send_to_rednerd_server()</field>
<field name="model_id" ref="model_redner_template" />
<field name="name">Send to rednerd server</field>
<field name="state">code</field>
<field name="type">ir.actions.server</field>
</record>
......@@ -87,3 +86,2 @@
</data>
</odoo>
......@@ -89,1 +87,2 @@
</odoo>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment