diff --git a/pylintrc b/pylintrc index d3fb7599fce..fce4dd56c90 100644 --- a/pylintrc +++ b/pylintrc @@ -53,6 +53,8 @@ disable= superfluous-parens, implicit-str-concat, unnecessary-dunder-call, + # These rules were added in Pylint >= 3.2 + possibly-used-before-assignment, [FORMAT] max-line-length=120 diff --git a/src/azure-cli-core/azure/cli/core/aaz/_field_value.py b/src/azure-cli-core/azure/cli/core/aaz/_field_value.py index defb2f955dd..d2ae2af358f 100644 --- a/src/azure-cli-core/azure/cli/core/aaz/_field_value.py +++ b/src/azure-cli-core/azure/cli/core/aaz/_field_value.py @@ -182,8 +182,7 @@ def __len__(self): return len(self._data) def __iter__(self): - for key in self._data: - yield key + yield from self._data def __eq__(self, other): if isinstance(other, AAZBaseValue): @@ -326,8 +325,7 @@ def __init__(self, schema, data): self._len = 0 if self._data is not None and self._data != AAZUndefined: for idx in self._data: - if idx + 1 > self._len: - self._len = idx + 1 + self._len = max(self._len, idx + 1) def __getitem__(self, idx) -> AAZBaseValue: if not isinstance(idx, int): @@ -341,8 +339,7 @@ def __getitem__(self, idx) -> AAZBaseValue: if idx not in self._data: self._data[idx] = AAZValuePatch.build(item_schema) - if idx + 1 > self._len: - self._len = idx + 1 + self._len = max(self._len, idx + 1) return item_schema._ValueCls(item_schema, self._data[idx]) @@ -362,8 +359,7 @@ def __setitem__(self, idx, data): self._data[idx] = item_schema.process_data(data, key=idx) - if idx + 1 > self._len: - self._len = idx + 1 + self._len = max(self._len, idx + 1) def __delitem__(self, idx): if not isinstance(idx, int): diff --git a/src/azure-cli-core/azure/cli/core/aaz/_help.py b/src/azure-cli-core/azure/cli/core/aaz/_help.py index 5423bc21334..daee4746f70 100644 --- a/src/azure-cli-core/azure/cli/core/aaz/_help.py +++ b/src/azure-cli-core/azure/cli/core/aaz/_help.py @@ -120,8 +120,7 @@ def _print_object_props_schema(cls, schema, title): prop_group_name = prop_schema._arg_group or "" header_len = len(prop_name) + len(prop_tags) + (1 if prop_tags else 0) - if header_len > max_header_len: - max_header_len = header_len + max_header_len = max(max_header_len, header_len) layouts.append({ "name": prop_name, "tags": prop_tags, diff --git a/src/azure-cli-core/azure/cli/core/aaz/_operation.py b/src/azure-cli-core/azure/cli/core/aaz/_operation.py index f1e6b5c4c8e..31283d4beb5 100644 --- a/src/azure-cli-core/azure/cli/core/aaz/_operation.py +++ b/src/azure-cli-core/azure/cli/core/aaz/_operation.py @@ -652,8 +652,7 @@ def _iter_aaz_object_keys(instance): if disc_schema is not None: schemas.append(disc_schema) for schema in schemas: - for key in schema._fields: - yield key + yield from schema._fields def _throw_and_show_options(self, instance, part, path, flatten): parent = '.'.join(path[:-1]).replace('.[', '[') diff --git a/src/azure-cli/azure/cli/command_modules/appservice/_create_util.py b/src/azure-cli/azure/cli/command_modules/appservice/_create_util.py index c646d1d1b3b..0be965693cd 100644 --- a/src/azure-cli/azure/cli/command_modules/appservice/_create_util.py +++ b/src/azure-cli/azure/cli/command_modules/appservice/_create_util.py @@ -305,8 +305,7 @@ def find_key_in_json(json_data, key): if key in k: yield v elif isinstance(v, dict): - for id_val in find_key_in_json(v, key): - yield id_val + yield from find_key_in_json(v, key) def set_location(cmd, sku, location): diff --git a/src/azure-cli/azure/cli/command_modules/backup/custom_help.py b/src/azure-cli/azure/cli/command_modules/backup/custom_help.py index d9e2da5841f..91ef79ab875 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/custom_help.py +++ b/src/azure-cli/azure/cli/command_modules/backup/custom_help.py @@ -238,8 +238,7 @@ def calculate_weekly_rpo(schedule_run_days): if backup_scheduled: if last_active_index is not None: gap = index - last_active_index - if gap > largest_gap: - largest_gap = gap + largest_gap = max(largest_gap, gap) last_active_index = index return largest_gap * 24 diff --git a/src/azure-cli/azure/cli/command_modules/network/custom.py b/src/azure-cli/azure/cli/command_modules/network/custom.py index fee97be2c30..c151f03cf10 100644 --- a/src/azure-cli/azure/cli/command_modules/network/custom.py +++ b/src/azure-cli/azure/cli/command_modules/network/custom.py @@ -1860,8 +1860,7 @@ def pre_operations(self): def pre_instance_update(self, instance): def _flatten(collection, expand_property_fn): for each in collection: - for value in expand_property_fn(each): - yield value + yield from expand_property_fn(each) if disabled_rule_groups or disabled_rules: disabled_groups = []