From 58980985c962599746e0f76a734faef88be133e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Thu, 2 Feb 2023 18:18:49 +0100 Subject: [PATCH] Pylint version update (cherry picked from commit 91d21fbabdb67018525eee24f3a9fbae8fe36915) --- .pylintrc | 7 ------- qubesmanager/clone_vm.py | 2 +- qubesmanager/firewall.py | 4 ++-- qubesmanager/global_settings.py | 6 +++--- qubesmanager/qube_manager.py | 4 ++-- qubesmanager/qvm_template_gui.py | 2 +- qubesmanager/settings.py | 4 ++-- 7 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.pylintrc b/.pylintrc index 153f58b9..77588635 100644 --- a/.pylintrc +++ b/.pylintrc @@ -17,12 +17,7 @@ ignore=tests, extension-pkg-whitelist=PyQt5 [MESSAGES CONTROL] -# abstract-class-little-used: see http://www.logilab.org/ticket/111138 -# deprecated-method: -# enable again after disabling py-3.4.3 asyncio.ensure_future compat hack disable= - abstract-class-little-used, - bad-continuation, cyclic-import, deprecated-method, duplicate-code, @@ -30,11 +25,9 @@ disable= fixme, inconsistent-return-statements, locally-disabled, - locally-enabled, logging-format-interpolation, missing-docstring, consider-using-f-string, - star-args, useless-super-delegation, wrong-import-order diff --git a/qubesmanager/clone_vm.py b/qubesmanager/clone_vm.py index 9c8df770..5b55b3e5 100644 --- a/qubesmanager/clone_vm.py +++ b/qubesmanager/clone_vm.py @@ -50,7 +50,7 @@ def __init__(self, qtapp, app, parent=None, src_vm=None): utils.initialize_widget_with_vms( widget=self.src_vm, qubes_app=self.app, - filter_function=(lambda vm: vm.klass != 'AdminVM')) + filter_function=lambda vm: vm.klass != 'AdminVM') if src_vm and self.src_vm.findText(src_vm.name) > -1: self.src_vm.setCurrentIndex(self.src_vm.findText(src_vm.name)) diff --git a/qubesmanager/firewall.py b/qubesmanager/firewall.py index d1bdd9d3..4564504d 100644 --- a/qubesmanager/firewall.py +++ b/qubesmanager/firewall.py @@ -190,7 +190,7 @@ def __init__(self, parent=None): self.__children = None # list of rules in the FW def sort(self, idx, order): - rev = (order == QtCore.Qt.AscendingOrder) + rev = order == QtCore.Qt.AscendingOrder self.children.sort(key=lambda x: self.get_column_string(idx, x), reverse=rev) @@ -294,7 +294,7 @@ def get_firewall_conf(self, vm): raise FirewallModifiedOutsideError(self.tr('it does not add up.')) - conf['allow'] = (common_action == 'accept') + conf['allow'] = common_action == 'accept' if not allow_icmp and not conf['allow']: raise FirewallModifiedOutsideError(self.tr('ICMP must be allowed.')) diff --git a/qubesmanager/global_settings.py b/qubesmanager/global_settings.py index 18b2fc8a..def390ea 100644 --- a/qubesmanager/global_settings.py +++ b/qubesmanager/global_settings.py @@ -505,7 +505,7 @@ def __init_updates__(self): elif repos.get('qubes-dom0-current', {}).get('enabled', None): self.dom0_updates_repo.setCurrentIndex(0) else: - raise Exception( + raise exc.QubesException( self.tr('Cannot detect enabled dom0 update repositories')) if repos.get('qubes-templates-itl-testing', {}).get('enabled', None): @@ -513,8 +513,8 @@ def __init_updates__(self): elif repos.get('qubes-templates-itl', {}).get('enabled', None): self.itl_tmpl_updates_repo.setCurrentIndex(0) else: - raise Exception(self.tr('Cannot detect enabled ITL template update ' - 'repositories')) + raise exc.QubesException(self.tr('Cannot detect enabled ITL ' + 'template update repositories')) if repos.get( 'qubes-templates-community-testing', {}).get('enabled', None): diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py index 62c68c59..5ecbe55f 100644 --- a/qubesmanager/qube_manager.py +++ b/qubesmanager/qube_manager.py @@ -507,8 +507,8 @@ def setData(self, index, value, role=Qt.EditRole): col_name = self.columns_indices[index.column()] if col_name == "Backup": vm = self.qubes_cache.get_vm(index.row()) - vm.vm.include_in_backups = (value == Qt.Checked) - vm.inc_backup = (value == Qt.Checked) + vm.vm.include_in_backups = value == Qt.Checked + vm.inc_backup = value == Qt.Checked return True return False diff --git a/qubesmanager/qvm_template_gui.py b/qubesmanager/qvm_template_gui.py index ce828bdc..2d7051d3 100644 --- a/qubesmanager/qvm_template_gui.py +++ b/qubesmanager/qvm_template_gui.py @@ -134,7 +134,7 @@ def flags(self, index): return super().flags(index) def sort(self, idx, order): - rev = (order == PyQt5.QtCore.Qt.AscendingOrder) + rev = order == PyQt5.QtCore.Qt.AscendingOrder self.children.sort(key=lambda x: x[idx], reverse=rev) self.dataChanged.emit(*self.row_index(0, self.rowCount() - 1)) diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index edf0171b..39bd7269 100644 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -1240,7 +1240,7 @@ def __apply_devices_tab__(self): self.vm.devices['pci'].detach(current_assignment) current_assignment.options['no-strict-reset'] = \ - (dev.ident in self.new_strict_reset_list) + dev.ident in self.new_strict_reset_list self.vm.devices['pci'].attach(current_assignment) @@ -1403,7 +1403,7 @@ def __apply_services_tab__(self): for i in range(self.services_list.count()): item = self.services_list.item(i) self.new_srv_dict[str(item.text())] = \ - (item.checkState() == ui_settingsdlg.QtCore.Qt.Checked) + item.checkState() == ui_settingsdlg.QtCore.Qt.Checked for service, v in self.new_srv_dict.items(): feature = SERVICE_PREFIX + service