From: Chen Hanxiao <chenhanxiao@xxxxxxxxx> Fix all E124: Closing bracket does not match visual indentation Also remove ignore options of E124 Signed-off-by: Chen Hanxiao <chenhanxiao@xxxxxxxxx> --- tests/pycodestyle.cfg | 3 +- virtManager/addhardware.py | 33 ++++++------ virtManager/details.py | 124 ++++++++++++++++++++++----------------------- virtManager/snapshots.py | 2 +- virtinst/urlfetcher.py | 6 +-- 5 files changed, 82 insertions(+), 86 deletions(-) diff --git a/tests/pycodestyle.cfg b/tests/pycodestyle.cfg index 2588043..38584d8 100644 --- a/tests/pycodestyle.cfg +++ b/tests/pycodestyle.cfg @@ -10,7 +10,6 @@ format = pylint # E122: Continuation line missing indentation or outdented # E123: Closing bracket does not match indentation of opening # bracket's line -# E124: Closing bracket does not match visual indentation # E125: Continuation line with same indent as next logical line # E126: Continuation line over-indented for hanging indent # E127: Continuation line over-indented for visual indent @@ -28,4 +27,4 @@ format = pylint # E741: Do not use variables named ‘l’, ‘O’, or ‘I’ -ignore = E122, E123, E124, E125, E126, E127, E128, E129, E221, E241, E301, E303, E305, E306, E402, E501, E741 +ignore = E122, E123, E125, E126, E127, E128, E129, E221, E241, E301, E303, E305, E306, E402, E501, E741 diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py index 4d142c9..c79d8be 100644 --- a/virtManager/addhardware.py +++ b/virtManager/addhardware.py @@ -43,23 +43,22 @@ from .baseclass import vmmGObjectUI from .addstorage import vmmAddStorage (PAGE_ERROR, -PAGE_DISK, -PAGE_CONTROLLER, -PAGE_NETWORK, -PAGE_INPUT, -PAGE_GRAPHICS, -PAGE_SOUND, -PAGE_HOSTDEV, -PAGE_CHAR, -PAGE_VIDEO, -PAGE_WATCHDOG, -PAGE_FILESYSTEM, -PAGE_SMARTCARD, -PAGE_USBREDIR, -PAGE_TPM, -PAGE_RNG, -PAGE_PANIC, -) = range(0, 17) + PAGE_DISK, + PAGE_CONTROLLER, + PAGE_NETWORK, + PAGE_INPUT, + PAGE_GRAPHICS, + PAGE_SOUND, + PAGE_HOSTDEV, + PAGE_CHAR, + PAGE_VIDEO, + PAGE_WATCHDOG, + PAGE_FILESYSTEM, + PAGE_SMARTCARD, + PAGE_USBREDIR, + PAGE_TPM, + PAGE_RNG, + PAGE_PANIC) = range(0, 17) class vmmAddHardware(vmmGObjectUI): diff --git a/virtManager/details.py b/virtManager/details.py index 4d1ae2c..0dd93a4 100644 --- a/virtManager/details.py +++ b/virtManager/details.py @@ -46,69 +46,67 @@ from .graphwidgets import Sparkline # Parameters that can be edited in the details window (EDIT_NAME, -EDIT_TITLE, -EDIT_MACHTYPE, -EDIT_FIRMWARE, -EDIT_DESC, -EDIT_IDMAP, - -EDIT_VCPUS, -EDIT_MAXVCPUS, -EDIT_CPU, -EDIT_TOPOLOGY, - -EDIT_MEM, - -EDIT_AUTOSTART, -EDIT_BOOTORDER, -EDIT_BOOTMENU, -EDIT_KERNEL, -EDIT_INIT, - -EDIT_DISK_RO, -EDIT_DISK_SHARE, -EDIT_DISK_REMOVABLE, -EDIT_DISK_CACHE, -EDIT_DISK_IO, -EDIT_DISK_BUS, -EDIT_DISK_SERIAL, -EDIT_DISK_FORMAT, -EDIT_DISK_SGIO, - -EDIT_SOUND_MODEL, - -EDIT_SMARTCARD_MODE, - -EDIT_NET_MODEL, -EDIT_NET_VPORT, -EDIT_NET_SOURCE, -EDIT_NET_MAC, - -EDIT_GFX_PASSWD, -EDIT_GFX_TYPE, -EDIT_GFX_KEYMAP, -EDIT_GFX_LISTEN, -EDIT_GFX_ADDRESS, -EDIT_GFX_TLSPORT, -EDIT_GFX_PORT, -EDIT_GFX_OPENGL, -EDIT_GFX_RENDERNODE, - -EDIT_VIDEO_MODEL, -EDIT_VIDEO_3D, - -EDIT_WATCHDOG_MODEL, -EDIT_WATCHDOG_ACTION, - -EDIT_CONTROLLER_MODEL, - -EDIT_TPM_TYPE, - -EDIT_FS, - -EDIT_HOSTDEV_ROMBAR, - -) = range(1, 49) + EDIT_TITLE, + EDIT_MACHTYPE, + EDIT_FIRMWARE, + EDIT_DESC, + EDIT_IDMAP, + + EDIT_VCPUS, + EDIT_MAXVCPUS, + EDIT_CPU, + EDIT_TOPOLOGY, + + EDIT_MEM, + + EDIT_AUTOSTART, + EDIT_BOOTORDER, + EDIT_BOOTMENU, + EDIT_KERNEL, + EDIT_INIT, + + EDIT_DISK_RO, + EDIT_DISK_SHARE, + EDIT_DISK_REMOVABLE, + EDIT_DISK_CACHE, + EDIT_DISK_IO, + EDIT_DISK_BUS, + EDIT_DISK_SERIAL, + EDIT_DISK_FORMAT, + EDIT_DISK_SGIO, + + EDIT_SOUND_MODEL, + + EDIT_SMARTCARD_MODE, + + EDIT_NET_MODEL, + EDIT_NET_VPORT, + EDIT_NET_SOURCE, + EDIT_NET_MAC, + + EDIT_GFX_PASSWD, + EDIT_GFX_TYPE, + EDIT_GFX_KEYMAP, + EDIT_GFX_LISTEN, + EDIT_GFX_ADDRESS, + EDIT_GFX_TLSPORT, + EDIT_GFX_PORT, + EDIT_GFX_OPENGL, + EDIT_GFX_RENDERNODE, + + EDIT_VIDEO_MODEL, + EDIT_VIDEO_3D, + + EDIT_WATCHDOG_MODEL, + EDIT_WATCHDOG_ACTION, + + EDIT_CONTROLLER_MODEL, + + EDIT_TPM_TYPE, + + EDIT_FS, + + EDIT_HOSTDEV_ROMBAR) = range(1, 49) # Columns in hw list model diff --git a/virtManager/snapshots.py b/virtManager/snapshots.py index 3429321..eeb1a9f 100644 --- a/virtManager/snapshots.py +++ b/virtManager/snapshots.py @@ -472,7 +472,7 @@ class vmmSnapshotPage(vmmGObjectUI): def _validate_new_snapshot(self): name = self.widget("snapshot-new-name").get_text() desc = self.widget("snapshot-new-description" - ).get_buffer().get_property("text") + ).get_buffer().get_property("text") try: newsnap = DomainSnapshot(self.vm.conn.get_backend()) diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py index 8296f2a..589b206 100644 --- a/virtinst/urlfetcher.py +++ b/virtinst/urlfetcher.py @@ -681,17 +681,17 @@ class GenericDistro(Distro): _xen_paths = [("images/xen/vmlinuz", "images/xen/initrd.img"), # Fedora - ] + ] _hvm_paths = [("images/pxeboot/vmlinuz", "images/pxeboot/initrd.img"), # Fedora ("ppc/ppc64/vmlinuz", "ppc/ppc64/initrd.img"), # CenOS 7 ppc64le - ] + ] _iso_paths = ["images/boot.iso", # RH/Fedora "boot/boot.iso", # Suse "current/images/netboot/mini.iso", # Debian "install/images/boot.iso", # Mandriva - ] + ] # Holds values to use when actually pulling down media _valid_kernel_path = None -- 2.7.5 _______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list