From 60143e6a9164916443335053392bf05336277674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Mon, 8 Jan 2018 20:56:22 +0100 Subject: [PATCH] Fixed some indents and whitespaces Fixed indents and whitespace that pylint was complaining about. --- qubesmanager/settings.py | 86 ++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 47 deletions(-) diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index 3306d57..c430fbb 100755 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -42,7 +42,7 @@ from .appmenu_select import AppmenuSelectManager from . import firewall from PyQt4 import QtCore, QtGui # pylint: disable=import-error -from . import ui_settingsdlg #pylint: disable=no-name-in-module +from . import ui_settingsdlg # pylint: disable=no-name-in-module # pylint: disable=too-many-instance-attributes @@ -140,7 +140,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): def reject(self): self.done(0) - #needed not to close the dialog before applying changes + # needed not to close the dialog before applying changes def accept(self): pass @@ -278,8 +278,8 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): self.delete_vm_button.setEnabled(not self.vm.is_running()) if self.vm.is_running(): - self.delete_vm_button.setText(self.tr('Delete VM ' - '(cannot delete a running VM)')) + self.delete_vm_button.setText( + self.tr('Delete VM (cannot delete a running VM)')) if self.vm.qid == 0: self.vmlabel.setVisible(False) @@ -325,13 +325,13 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except AttributeError: self.autostart_vm.setVisible(False) - #type + # type self.type_label.setText(self.vm.klass) - #installed by rpm + # installed by rpm self.rpm_label.setText('Yes' if self.vm.installed_by_rpm else 'No') - #networking info + # networking info if self.vm.netvm: self.networking_groupbox.setEnabled(True) self.ip_label.setText(self.vm.ip or "none") @@ -340,7 +340,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): else: self.networking_groupbox.setEnabled(False) - #max priv storage + # max priv storage self.priv_img_size = self.vm.volumes['private'].size // 1024**2 self.max_priv_storage.setMinimum(self.priv_img_size) self.max_priv_storage.setValue(self.priv_img_size) @@ -354,7 +354,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): def __apply_basic_tab__(self): msg = [] - #vm label changed + # vm label changed try: if self.vmlabel.isVisible(): if self.vmlabel.currentIndex() != self.label_idx: @@ -363,7 +363,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #vm template changed + # vm template changed try: if self.template_name.currentIndex() != self.template_idx: self.vm.template = \ @@ -371,14 +371,14 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #vm netvm changed + # vm netvm changed try: if self.netVM.currentIndex() != self.netvm_idx: self.vm.netvm = self.netvm_list[self.netVM.currentIndex()] except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #include in backups + # include in backups try: if self.vm.include_in_backups != \ self.include_in_backups.isChecked(): @@ -386,7 +386,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #run_in_debug_mode + # run_in_debug_mode try: if self.run_in_debug_mode.isVisible(): if self.vm.debug != self.run_in_debug_mode.isChecked(): @@ -394,7 +394,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #autostart_vm + # autostart_vm try: if self.autostart_vm.isVisible(): if self.vm.autostart != self.autostart_vm.isChecked(): @@ -402,7 +402,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #max priv storage + # max priv storage priv_size = self.max_priv_storage.value() if self.priv_img_size != priv_size: try: @@ -410,7 +410,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #max sys storage + # max sys storage sys_size = self.root_resize.value() if self.root_img_size != sys_size: try: @@ -420,7 +420,6 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): return msg - def check_mem_changes(self): if self.max_mem_size.value() < self.init_mem.value(): QtGui.QMessageBox.warning( @@ -453,10 +452,9 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): if not t_monitor.success: QtGui.QMessageBox.warning(None, - self.tr("Error!"), - self.tr("ERROR: {}").format( - t_monitor.error_msg)) - + self.tr("Error!"), + self.tr("ERROR: {}").format( + t_monitor.error_msg)) def _rename_vm(self, t_monitor, name): try: @@ -470,7 +468,6 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): t_monitor.set_finished() - def rename_vm(self): new_vm_name, ok = QtGui.QInputDialog.getText( @@ -499,10 +496,9 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): self, self.tr('Delete VM'), self.tr('Are you absolutely sure you want to delete this VM? ' - '
All VM settings and data will be irrevocably' - ' deleted.
If you are sure, please enter this ' - 'VM\'s name below.')) - + '
All VM settings and data will be irrevocably' + ' deleted.
If you are sure, please enter this ' + 'VM\'s name below.')) if ok and answer == self.vm.name: self._run_in_thread(self._remove_vm) @@ -543,7 +539,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): def __init_advanced_tab__(self): - #mem/cpu + # mem/cpu # qubes_memory = QubesHost().memory_total/1024 self.init_mem.setValue(int(self.vm.memory)) @@ -561,7 +557,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): bool(self.vm.features.get('service.meminfo-writer', True))) self.max_mem_size.setEnabled(self.include_in_balancing.isChecked()) - #in case VM is HVM + # in case VM is HVM if hasattr(self.vm, "kernel"): self.kernel_groupbox.setVisible(True) self.kernel_list, self.kernel_idx = utils.prepare_kernel_choice( @@ -588,7 +584,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): def __apply_advanced_tab__(self): msg = [] - #mem/cpu + # mem/cpu try: if self.init_mem.value() != int(self.vm.memory): self.vm.memory = self.init_mem.value() @@ -601,9 +597,9 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #include_in_memory_balancing applied in services tab + # include_in_memory_balancing applied in services tab - #in case VM is not Linux + # in case VM is not Linux if hasattr(self.vm, "kernel") and self.kernel_groupbox.isVisible(): try: if self.kernel.currentIndex() != self.kernel_idx: @@ -612,7 +608,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): except qubesadmin.exc.QubesException as ex: msg.append(str(ex)) - #vm default_dispvm changed + # vm default_dispvm changed try: if self.default_dispvm.currentIndex() != self.default_dispvm_idx: self.vm.default_dispvm = \ @@ -644,7 +640,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): self.ident = ident persistent = [ass.ident.replace('_', ':') - for ass in self.vm.devices['pci'].persistent()] + for ass in self.vm.devices['pci'].persistent()] for name, ident in devs: if ident in persistent: @@ -669,16 +665,15 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): self.dev_list.setEnabled(True) self.turn_off_vm_to_modify_devs.setVisible(False) - def __apply_devices_tab__(self): msg = [] try: old = [ass.ident.replace('_', ':') - for ass in self.vm.devices['pci'].persistent()] + for ass in self.vm.devices['pci'].persistent()] new = [self.dev_list.selected_list.item(i).ident - for i in range(self.dev_list.selected_list.count())] + for i in range(self.dev_list.selected_list.count())] for ident in new: if ident not in old: ass = devices.DeviceAssignment( @@ -774,7 +769,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): service = feature[len('service.'):] item = QtGui.QListWidgetItem(service) item.setCheckState(ui_settingsdlg.QtCore.Qt.Checked - if self.vm.features[feature] + if self.vm.features[feature] else ui_settingsdlg.QtCore.Qt.Unchecked) self.services_list.addItem(item) self.new_srv_dict[service] = self.vm.features[feature] @@ -815,7 +810,6 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): item = self.services_list.takeItem(row) del self.new_srv_dict[str(item.text())] - def services_item_clicked(self, item): if str(item.text()) == 'meminfo-writer': if item.checkState() == ui_settingsdlg.QtCore.Qt.Checked: @@ -825,7 +819,6 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): if self.include_in_balancing.isChecked(): self.include_in_balancing.setChecked(False) - def __apply_services_tab__(self): msg = [] @@ -861,9 +854,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): return msg - ######### firewall tab related - def set_fw_model(self, model): self.fw_model = model self.rulesTreeView.setModel(model) @@ -942,10 +933,10 @@ def handle_exception(exc_type, exc_value, exc_traceback): while stacktrace: (filename, line, func, txt) = stacktrace.pop() strace += "----\n" - strace += "line: %s\n" %txt - strace += "func: %s\n" %func - strace += "line no.: %d\n" %line - strace += "file: %s\n" %filename + strace += "line: %s\n" % txt + strace += "func: %s\n" % func + strace += "line no.: %d\n" % line + strace += "file: %s\n" % filename msg_box = QtGui.QMessageBox() msg_box.setDetailedText(strace) @@ -963,13 +954,14 @@ def handle_exception(exc_type, exc_value, exc_traceback): parser = QubesArgumentParser(vmname_nargs=1) parser.add_argument('--tab', metavar='TAB', - action='store', - choices=VMSettingsWindow.tabs_indices.keys()) + action='store', + choices=VMSettingsWindow.tabs_indices.keys()) parser.set_defaults( tab='basic', ) + def main(args=None): args = parser.parse_args(args) vm = args.domains.pop()