[chore] util: handle ruff claims

Part of odoo/upgrade#5130

Signed-off-by: Christophe Simonis (chs) <[email protected]>

Author: KangOl

src/util/const.py

@@ -12,12 +12,12 @@
 ENVIRON = {
     "__renamed_fields": collections.defaultdict(dict),
     "__modules_auto_discovery_force_installs": set(),
-    "__modules_auto_discovery_force_upgrades": dict(),
+    "__modules_auto_discovery_force_upgrades": {},
     "__fix_fk_allowed_cascade": [],
     "__no_model_data_delete": {},
 }
 
 NEARLYWARN = 25  # between info and warning; appear on runbot build page
 netsvc.LEVEL_COLOR_MAPPING[NEARLYWARN] = (netsvc.YELLOW, netsvc.DEFAULT)
 
-BIG_TABLE_THRESHOLD = int(os.getenv("ODOO_UPG_BIG_TABLE_THRESHOLD", 40000))
+BIG_TABLE_THRESHOLD = int(os.getenv("ODOO_UPG_BIG_TABLE_THRESHOLD", "40000"))

src/util/convert_bootstrap.py

@@ -253,9 +253,7 @@ def simple_css_selector_to_xpath(selector, prefix="//"):
     separator = prefix
     xpath_parts = []
     combinators = "+>,~ "
-    for selector_part in re.split(rf"(\s*[{combinators}]\s*)", selector):
-        selector_part = selector_part.strip()
-
+    for selector_part in map(str.strip, re.split(rf"(\s*[{combinators}]\s*)", selector)):
         if not selector_part:
             separator = "//"
         elif selector_part == ">":
@@ -310,8 +308,7 @@ def adapt_xpath_for_qweb(xpath):
         r"normalize-space(concat(@\1, ' ', @t-att-\1, ' ', @t-attf-\1))",
         xpath,
     )
-    xpath = re.sub(r"\[@(?<!t-)([\w-]+)\]", r"[@\1 or @t-att-\1 or @t-attf-\1]", xpath)
-    return xpath
+    return re.sub(r"\[@(?<!t-)([\w-]+)\]", r"[@\1 or @t-att-\1 or @t-attf-\1]", xpath)
 
 
 class ElementOperation:
@@ -367,7 +364,6 @@ def __call__(self, element, converter):
         if parent is None:
             raise ValueError(f"Cannot remove root element {element}")
         parent.remove(element)
-        return None
 
 
 class EditClasses(ElementOperation):
@@ -484,7 +480,6 @@ def __call__(self, element, converter):
             element.addprevious(child)
 
         parent.remove(element)
-        return None
 
 
 class RenameAttribute(ElementOperation):
@@ -711,7 +706,7 @@ class BS4to5ConvertCardDeck(ElementOperation):
     def __call__(self, element, converter):
         cards = element.xpath(converter.adapt_xpath("./*[hasclass('card')]"))
 
-        cols_class = f"row-cols-{len(cards) if 0 < len(cards) <= 6 else 'auto'}"
+        cols_class = f"row-cols-{len(cards)}" if len(cards) in range(1, 7) else "row-cols-auto"
         edit_element_classes(element, add=["row", cols_class], remove="card-deck", is_qweb=converter.is_qweb)
 
         for card in cards:
@@ -1008,7 +1003,7 @@ def convert(self, src_version, dst_version):
                 for operation in operations:
                     if element is None:  # previous operations that returned None (i.e. deleted element)
                         raise ValueError("Matched xml element is not available anymore! Check operations.")
-                    element = operation(element, self)
+                    element = operation(element, self)  # noqa: PLW2901
                     applied_operations_count += 1
         return self.tree, applied_operations_count
 

src/util/data.py

@@ -206,5 +206,5 @@ def drop_workflow(cr, osv):
             FOREIGN KEY (instance_id) REFERENCES wkf_instance(id)
             ON DELETE CASCADE;
         """,
-        dict(osv=osv),
+        {"osv": osv},
     )

src/util/domains.py

@@ -279,12 +279,13 @@ def adapt_domains(cr, model, old, new, adapter=None, skip_inherit=(), force_adap
             [match_old],
         )
         for id_, model, domain in cr.fetchall():
-            domain = _adapt_one_domain(
+            new_domain = _adapt_one_domain(
                 cr, target_model, old, new, model, domain, adapter=adapter, force_adapt=force_adapt
             )
-            if domain:
+            if new_domain:
                 cr.execute(
-                    "UPDATE {df.table} SET {df.domain_column} = %s WHERE id = %s".format(df=df), [unicode(domain), id_]
+                    "UPDATE {df.table} SET {df.domain_column} = %s WHERE id = %s".format(df=df),
+                    [unicode(new_domain), id_],
                 )
 
     # adapt domain in dashboards.

src/util/fields.py

@@ -98,15 +98,15 @@ def remove_field(cr, model, fieldname, cascade=False, drop_column=True, skip_inh
     def filter_value(key, value):
         if key == "orderedBy" and isinstance(value, dict):
             res = {k: (filter_value(None, v) if k == "name" else v) for k, v in value.items()}
-            if "name" not in res or res["name"] is not None:
-                # return if name didn't match fieldname
-                return res
-        elif not isinstance(value, basestring):  # noqa: SIM114
+            # return if name didn't match fieldname
+            return res if "name" not in res or res["name"] is not None else None
+        if not isinstance(value, basestring):
             # if not a string, ignore it
             return value
-        elif value.split(":")[0] != fieldname:
+        if value.split(":")[0] != fieldname:
             # only return if not matching fieldname
             return value
+        return None  # value filtered out
 
     def clean_context(context):
         if not isinstance(context, dict):
@@ -119,7 +119,7 @@ def clean_context(context):
                 changed |= context_part != context[key]
                 context[key] = [e for e in context_part if e is not None]
 
-        for vt in {"pivot", "graph", "cohort"}:
+        for vt in ["pivot", "graph", "cohort"]:
             key = "{}_measure".format(vt)
             if key in context:
                 new_value = filter_value(key, context[key])
@@ -146,8 +146,8 @@ def clean_context(context):
         "SELECT id, name, context FROM ir_filters WHERE model_id = %s AND context ~ %s",
         [model, r"\y{}\y".format(fieldname)],
     )
-    for id_, name, context in cr.fetchall():
-        context = safe_eval(context or "{}", SelfPrintEvalContext(), nocopy=True)
+    for id_, name, context_s in cr.fetchall():
+        context = safe_eval(context_s or "{}", SelfPrintEvalContext(), nocopy=True)
         changed = clean_context(context)
         cr.execute("UPDATE ir_filters SET context = %s WHERE id = %s", [unicode(context), id_])
         if changed:
@@ -255,9 +255,9 @@ def adapter(leaf, is_or, negated):
         """,
             [model, r"\y%s\y" % (fieldname,)],
         )
-        for alias_id, defaults in cr.fetchall():
+        for alias_id, defaults_s in cr.fetchall():
             try:
-                defaults = dict(safe_eval(defaults))  # XXX literal_eval should works.
+                defaults = dict(safe_eval(defaults_s))  # XXX literal_eval should works.
             except Exception:
                 continue
             defaults.pop(fieldname, None)
@@ -638,12 +638,12 @@ def convert_binary_field_to_attachment(cr, model, field, encoded=True, name_fiel
     for rid, data, name in iter_cur:
         # we can't save create the attachment with res_model & res_id as it will fail computing
         # `res_name` field for non-loaded models. Store it naked and change it via SQL after.
-        data = bytes(data)
+        data = bytes(data)  # noqa: PLW2901
         if re.match(b"^\\d+ (bytes|[KMG]b)$", data, re.I):
             # badly saved data, no need to create an attachment.
             continue
         if not encoded:
-            data = base64.b64encode(data)
+            data = base64.b64encode(data)  # noqa: PLW2901
         att = A.create({"name": name, "datas": data, "type": "binary"})
         cr.execute(
             """
@@ -937,7 +937,7 @@ def adapt_dict(d):
                 if d.get(key):
                     d[key] = [adapt_value(key, e) for e in d[key]]
 
-            for vt in {"pivot", "graph", "cohort"}:
+            for vt in ["pivot", "graph", "cohort"]:
                 key = "{}_measure".format(vt)
                 if key in d:
                     d[key] = adapt_value(key, d[key])
@@ -990,8 +990,7 @@ def adapt_related(cr, model, old, new, skip_inherit=()):
     for id_, model, related in cr.fetchall():
         domain = _adapt_one_domain(cr, target_model, old, new, model, [(related, "=", "related")])
         if domain:
-            related = domain[0][0]
-            cr.execute("UPDATE ir_model_fields SET related = %s WHERE id = %s", [related, id_])
+            cr.execute("UPDATE ir_model_fields SET related = %s WHERE id = %s", [domain[0][0], id_])
 
     # TODO adapt paths in email templates?
 
@@ -1059,7 +1058,7 @@ def update_server_actions_fields(cr, src_model, dst_model=None, fields_mapping=N
 
     # update ir_act_server records to point to the right model if set
     if dst_model is not None and src_model != dst_model and cr.rowcount > 0:
-        action_ids = tuple(set([row[0] for row in cr.fetchall()]))
+        action_ids = tuple({row[0] for row in cr.fetchall()})  # uniquify ids
 
         cr.execute(
             """

src/util/helpers.py

@@ -20,7 +20,7 @@
         "o2m_changes_parent",
         "o2m_changes_children",
     }
-    | set(m.strip() for m in os.getenv("UPG_VALID_MODELS", "").split(";")) - {""}
+    | {m.strip() for m in os.getenv("UPG_VALID_MODELS", "").split(";")} - {""}
 )
 
 # python3 shims
@@ -184,10 +184,10 @@ def _dashboard_actions(cr, arch_match, *models):
     for dash_id, arch in cr.fetchall():
         try:
             if isinstance(arch, unicode):
-                arch = arch.encode("utf-8")
+                arch = arch.encode("utf-8")  # noqa: PLW2901
             dash = lxml.etree.fromstring(arch)
         except lxml.etree.XMLSyntaxError:
-            _logger.error("Cannot parse dashboard %s", dash_id)
+            _logger.exception("Cannot parse dashboard %s", dash_id)
             continue
         for act in dash.xpath("//action"):
             if models:

src/util/indirect_references.py

@@ -74,7 +74,7 @@ def indirect_references(cr, bound_only=False):
         IR("marketing_participant", "model_name", "res_id", "model_id", set_unknown=True),
         IR("payment_transaction", None, "callback_res_id", "callback_model_id"),
         IR("project_project", "alias_model", None, set_unknown=True),
-        # IR("pos_blackbox_be_log", "model_name", None),  # ACTUALLY NOT. We need to keep records intact, even when renaming a model
+        # IR("pos_blackbox_be_log", "model_name", None),  # ACTUALLY NOT. We need to keep records intact, even when renaming a model  # noqa: ERA001
         IR("quality_point", "worksheet_model_name", None),
         IR("rating_rating", "res_model", "res_id", "res_model_id"),
         IR("rating_rating", "parent_res_model", "parent_res_id", "parent_res_model_id"),
@@ -97,9 +97,9 @@ def indirect_references(cr, bound_only=False):
         # versions (i.e. rating_rating.res_model_id was added in saas~15).
         # we need to verify existance of columns before using them.
         if ir.res_model and not column_exists(cr, ir.table, ir.res_model):
-            ir = ir._replace(res_model=None)
+            ir = ir._replace(res_model=None)  # noqa: PLW2901
         if ir.res_model_id and not column_exists(cr, ir.table, ir.res_model_id):
-            ir = ir._replace(res_model_id=None)
+            ir = ir._replace(res_model_id=None)  # noqa: PLW2901
         if not ir.res_model and not ir.res_model_id:
             continue
 

src/util/jinja_to_qweb.py

@@ -5,8 +5,8 @@
 import re
 
 import babel
-import dateutil.relativedelta as relativedelta
 import lxml
+from dateutil import relativedelta
 from jinja2.sandbox import SandboxedEnvironment
 from markupsafe import Markup
 from werkzeug import urls
@@ -164,8 +164,7 @@ def convert_jinja_to_qweb(string):
     result = lxml.etree.tostring(lxml.html.fragment_fromstring(result, create_parent="div"), encoding="unicode")
 
     # Remove the parent div
-    result = result[5:-6]
-    return result
+    return result[5:-6]
 
 
 def _get_set(matchobj):

src/util/logger.py

@@ -15,7 +15,7 @@ def __init__(self):
         super(CriticalHandler, self).__init__(logging.CRITICAL)
 
     def emit(self, record):
-        global _REGISTERED
+        global _REGISTERED  # noqa: PLW0603
         if _REGISTERED:
             return
 

src/util/misc.py

@@ -144,7 +144,7 @@ def import_script(path, name=None):
             if full_path.exists():
                 break
         else:
-            raise ImportError(path)
+            raise ImportError(path)  # noqa: TRY301
         spec = importlib.util.spec_from_file_location(name, full_path)
         module = importlib.util.module_from_spec(spec)
         spec.loader.exec_module(module)
@@ -219,7 +219,8 @@ def log_progress(it, logger, qualifier="elements", size=None, estimate=True, log
     for i, e in enumerate(it, 1):
         yield e
         t2 = datetime.datetime.now()
-        if (t2 - t1).total_seconds() > 60 or (log_hundred_percent and i == size and (t2 - t0).total_seconds() > 10):
+        secs_last, secs_start = (t2 - t1).total_seconds(), (t2 - t0).total_seconds()
+        if secs_last > 60 or (log_hundred_percent and i == size and secs_start > 10):
             t1 = datetime.datetime.now()
             tdiff = t2 - t0
             j = float(i)