ba698f40db
9a9f9ecd-ignore-comments-in-keymap-conf-files.patch 9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch 6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch d1e1cf64-progress-remove-trailing-white-space.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch bc3c9a9d-progress-remove-unused-import.patch 2d276ebe-progress-dont-overwrite-format.patch e2ad4b2f-convert-iteritems-to-items.patch dff00d4f-remove-deprecated-statvfs-module.patch 75210ed3-replace-StringIO-with-io.patch a2bcd6c4-dont-compare-between-None-and-int.patch 44de92b7-use-reload-from-imp-module.patch 69c84bea-import-reduce-from-functools-module.patch 37ea5207-replace-StandardError-with-Exception.patch f41aafc7-Use-enumerate-instead-of-range-and-len.patch 91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch 999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch 7f1b4cee-pycodestyle-fix-all-E125-warnings.patch d82022bd-manager-drop-python2-only-cmp-usage.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch f7c8cf9f-devicepanic-dont-return-empty-model-list.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 73de8285-systray-remove-redundant-variable-assignment.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=375
75 lines
2.8 KiB
Diff
75 lines
2.8 KiB
Diff
Subject: Use enumerate instead of range and len
|
|
From: Radostin Stoyanov rstoyanov1@gmail.com Wed Oct 11 12:36:03 2017 +0100
|
|
Date: Fri Oct 20 13:18:31 2017 -0400:
|
|
Git: f41aafc721e8fbe9baa0bc52ec9482ae3e5666ae
|
|
|
|
|
|
diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py
|
|
index cf860e63..3793006c 100644
|
|
--- a/virtManager/addhardware.py
|
|
+++ b/virtManager/addhardware.py
|
|
@@ -594,9 +594,8 @@ class vmmAddHardware(vmmGObjectUI):
|
|
vmmAddHardware.populate_smartcard_mode_combo(vm, combo)
|
|
|
|
idx = -1
|
|
- for rowid in range(len(combo.get_model())):
|
|
+ for rowid, row in enumerate(combo.get_model()):
|
|
idx = 0
|
|
- row = combo.get_model()[rowid]
|
|
if row[0] == virtinst.VirtualSmartCardDevice.MODE_DEFAULT:
|
|
idx = rowid
|
|
break
|
|
@@ -641,9 +640,8 @@ class vmmAddHardware(vmmGObjectUI):
|
|
vmmAddHardware.populate_tpm_type_combo(vm, combo)
|
|
|
|
idx = -1
|
|
- for rowid in range(len(combo.get_model())):
|
|
+ for rowid, row in enumerate(combo.get_model()):
|
|
idx = 0
|
|
- row = combo.get_model()[rowid]
|
|
if row[0] == virtinst.VirtualTPMDevice.TYPE_DEFAULT:
|
|
idx = rowid
|
|
break
|
|
diff --git a/virtManager/netlist.py b/virtManager/netlist.py
|
|
index 4f1e991a..0bb17965 100644
|
|
--- a/virtManager/netlist.py
|
|
+++ b/virtManager/netlist.py
|
|
@@ -288,8 +288,8 @@ class vmmNetworkList(vmmGObjectUI):
|
|
model.insert(0, row)
|
|
default = 0
|
|
elif label:
|
|
- default = [idx for idx in range(len(model)) if
|
|
- model[idx][2] == label][0]
|
|
+ default = [idx for idx, model_label in enumerate(model) if
|
|
+ model_label[2] == label][0]
|
|
|
|
_add_manual_bridge_row()
|
|
return default
|
|
diff --git a/virtManager/systray.py b/virtManager/systray.py
|
|
index ff550738..aa62df0a 100644
|
|
--- a/virtManager/systray.py
|
|
+++ b/virtManager/systray.py
|
|
@@ -274,7 +274,7 @@ class vmmSystray(vmmGObject):
|
|
vm_submenu.insert(menu_item, 0)
|
|
return
|
|
|
|
- for i in range(0, len(vm_names)):
|
|
+ for i, name in enumerate(vm_names):
|
|
name = vm_names[i]
|
|
connkey = vm_mappings[name]
|
|
if connkey in self.conn_vm_menuitems[uri]:
|
|
diff --git a/virtinst/cloner.py b/virtinst/cloner.py
|
|
index 7345bdad..9be5485c 100644
|
|
--- a/virtinst/cloner.py
|
|
+++ b/virtinst/cloner.py
|
|
@@ -430,8 +430,7 @@ class Cloner(object):
|
|
iface.macaddr = mac
|
|
|
|
# Changing storage XML
|
|
- for i in range(len(self._original_disks)):
|
|
- orig_disk = self._original_disks[i]
|
|
+ for i, orig_disk in enumerate(self._original_disks):
|
|
clone_disk = self._clone_disks[i]
|
|
|
|
for disk in self._guest.get_devices("disk"):
|