Skip to content

Commit 5a10462

Browse files
committed
[IMP] mis_builder: pre-commit fixes.
1 parent 83d0cd5 commit 5a10462

5 files changed

Lines changed: 13 additions & 17 deletions

File tree

mis_builder/models/mis_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ def _default_move_lines_source(self):
447447
("field_id.name", "=", "date"),
448448
("field_id.name", "=", "company_id"),
449449
],
450-
default=_default_move_lines_source,
450+
default=lambda self: self._default_move_lines_source(),
451451
required=True,
452452
ondelete="cascade",
453453
help="A 'move line like' model, ie having at least debit, credit, "

mis_builder/models/mis_report_style.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Copyright 2020 CorporateHub (https://corporatehub.eu)
44
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
55

6-
import sys
76

87
from odoo import api, fields, models
98
from odoo.exceptions import ValidationError
@@ -12,15 +11,13 @@
1211
from .accounting_none import AccountingNone
1312
from .data_error import DataError
1413

15-
if sys.version_info.major >= 3:
16-
unicode = str
17-
1814

1915
class PropertyDict(dict):
2016
def __getattr__(self, name):
2117
return self.get(name)
2218

23-
def copy(self): # pylint: disable=copy-wo-api-one,method-required-super
19+
# pylint: disable=method-required-super
20+
def copy(self):
2421
return PropertyDict(self)
2522

2623

@@ -224,7 +221,8 @@ def render_num(
224221
if value is None or value is AccountingNone:
225222
return ""
226223
value = float_round(value / float(divider or 1), dp or 0) or 0
227-
r = lang.format("%%%s.%df" % (sign, dp or 0), value, grouping=True)
224+
format_str = f"%{sign}.{dp or 0}f"
225+
r = lang.format(format_str, value, grouping=True)
228226
r = r.replace("-", "\N{NON-BREAKING HYPHEN}")
229227
if prefix:
230228
r = prefix + "\N{NO-BREAK SPACE}" + r
@@ -240,7 +238,7 @@ def render_pct(self, lang, value, dp=1, sign="-"):
240238
def render_str(self, lang, value):
241239
if value is None or value is AccountingNone:
242240
return ""
243-
return unicode(value)
241+
return str(value)
244242

245243
@api.model
246244
def compare_and_render(
@@ -287,10 +285,8 @@ def compare_and_render(
287285
delta = AccountingNone
288286
elif var_type == TYPE_NUM:
289287
if value and average_value:
290-
# pylint: disable=redefined-variable-type
291288
value = value / float(average_value)
292289
if base_value and average_base_value:
293-
# pylint: disable=redefined-variable-type
294290
base_value = base_value / float(average_base_value)
295291
if compare_method == CMP_DIFF:
296292
delta = value - base_value

mis_builder/tests/common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ def assert_matrix(matrix, expected):
2626
if row is not None and expected_row is None:
2727
raise AssertionError("too many rows")
2828
for j, cell, expected_val in _zip(row.iter_cells(), expected_row):
29-
assert (
30-
(cell and cell.val) == expected_val
31-
), f"{cell and cell.val} != {expected_val} in row {i} col {j}"
29+
assert (cell and cell.val) == expected_val, (
30+
f"{cell and cell.val} != {expected_val} in row {i} col {j}"
31+
)
3232

3333

3434
@tagged("doctest")

mis_builder/tests/test_period_dates.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ def test_rel_date_range(self):
124124
self.env["date.range"].create(
125125
dict(
126126
type_id=date_range_type.id,
127-
name="%d" % year,
128-
date_start="%d-01-01" % year,
129-
date_end="%d-12-31" % year,
127+
name=f"{year}",
128+
date_start=f"{year}-01-01",
129+
date_end=f"{year}-12-31",
130130
company_id=date_range_type.company_id.id,
131131
)
132132
)

mis_builder/wizard/mis_builder_dashboard.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AddMisReportInstanceDashboard(models.TransientModel):
1717
"ir.actions.act_window",
1818
string="Dashboard",
1919
required=True,
20-
domain="[('res_model', '=', " "'board.board')]",
20+
domain="[('res_model', '=', 'board.board')]",
2121
)
2222

2323
@api.model

0 commit comments

Comments
 (0)