Skip to content

Commit 62f7445

Browse files
committed
[chore] lint all files
closes #232 Signed-off-by: Christophe Simonis (chs) <[email protected]>
1 parent 4828282 commit 62f7445

File tree

6 files changed

+40
-14
lines changed

6 files changed

+40
-14
lines changed

src/base/17.0.1.3/attr_domains2expr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ def mod2bool_str(s):
111111
Note that 0 and 1 are left unchanged since they have the same True/False meaning in Python.
112112
"""
113113
ss = s.lower()
114-
if ss in "yes true on".split():
114+
if ss in ["yes", "true", "on"]:
115115
return "True"
116-
if ss in "no false off".split():
116+
if ss in ["no", "false", "off"]:
117117
return "False"
118118
return s
119119

src/util/convert_bootstrap.py

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -856,11 +856,37 @@ class BootstrapConverter:
856856
RenameAttribute.op("data-display", "data-bs-display", "[not(@data-snippet='s_countdown')]"),
857857
*[
858858
RenameAttribute.op(f"data-{attr}", f"data-bs-{attr}")
859-
for attr in (
860-
"animation attributes autohide backdrop body container content delay dismiss focus"
861-
" interval margin-right no-jquery offset original-title padding-right parent placement"
862-
" ride sanitize show slide slide-to spy target toggle touch trigger whatever"
863-
).split(" ")
859+
for attr in [
860+
"animation",
861+
"attributes",
862+
"autohide",
863+
"backdrop",
864+
"body",
865+
"container",
866+
"content",
867+
"delay",
868+
"dismiss",
869+
"focus",
870+
"interval",
871+
"margin-right",
872+
"no-jquery",
873+
"offset",
874+
"original-title",
875+
"padding-right",
876+
"parent",
877+
"placement",
878+
"ride",
879+
"sanitize",
880+
"show",
881+
"slide",
882+
"slide-to",
883+
"spy",
884+
"target",
885+
"toggle",
886+
"touch",
887+
"trigger",
888+
"whatever",
889+
]
864890
],
865891
# popover
866892
(CSS(".popover .arrow"), [ReplaceClasses("arrow", "popover-arrow")]),

src/util/jinja_to_qweb.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,14 +491,14 @@ def verify_upgraded_jinja_fields(cr):
491491
def is_converted_template_valid(env, template_before, template_after, model_name, record_id, engine="inline_template"):
492492
render_before = None
493493
with contextlib.suppress(Exception):
494-
render_before = _render_template_jinja(env, Markup(template_before), model_name, record_id)
494+
render_before = _render_template_jinja(env, template_before, model_name, record_id)
495495

496496
render_after = None
497497
if render_before is not None:
498498
try:
499499
with mute_logger("odoo.addons.mail.models.mail_render_mixin"):
500500
render_after = env["mail.render.mixin"]._render_template(
501-
Markup(template_after), model_name, [record_id], engine=engine
501+
template_after, model_name, [record_id], engine=engine
502502
)[record_id]
503503
except Exception:
504504
pass
@@ -604,4 +604,4 @@ def _render_template_jinja(env, template_txt, model, res_id):
604604
render_result = template.render(variables)
605605
if render_result == "False":
606606
render_result = ""
607-
return Markup(render_result)
607+
return render_result

src/util/misc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def wrapper(*args, **kwargs):
5555
# copied from odoo as older OpenERP versions doesn't have it
5656
def str2bool(s, default=None):
5757
s = unicode(s).lower()
58-
y = "y yes 1 true t on".split()
59-
n = "n no 0 false f off".split()
58+
y = ["y", "yes", "1", "true", "t", "on"]
59+
n = ["n", "no", "0", "false", "f", "off"]
6060
if s not in (y + n):
6161
if default is None:
6262
raise ValueError("Use 0/1/yes/no/true/false/on/off")

src/util/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def remove_model(cr, model, drop_table=True, ignore_m2m=()):
171171
[mod_id, mod_label] = cr.fetchone() or [None, model]
172172
if mod_id:
173173
# some required fk are in "ON DELETE SET NULL/RESTRICT".
174-
for tbl in "base_action_rule base_automation google_drive_config".split():
174+
for tbl in ["base_action_rule", "base_automation", "google_drive_config"]:
175175
if column_exists(cr, tbl, "model_id"):
176176
cr.execute("DELETE FROM {0} WHERE model_id=%s".format(tbl), [mod_id])
177177
cr.execute("DELETE FROM ir_model_relation WHERE model=%s", (mod_id,))

src/util/spreadsheet/tokenizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def replace_special_spaces(text):
7575

7676

7777
POSTFIX_UNARY_OPERATORS = ["%"]
78-
OPERATORS = "+,-,*,/,:,=,<>,>=,>,<=,<,^,&".split(",") + POSTFIX_UNARY_OPERATORS
78+
OPERATORS = ["+", "-", "*", "/", ":", "=", "<>", ">=", ">", "<=", "<", "^", "&"] + POSTFIX_UNARY_OPERATORS
7979

8080

8181
def tokenize(string, locale=DEFAULT_LOCALE):

0 commit comments

Comments
 (0)