4072874bbf
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=487
93 lines
3.6 KiB
Diff
93 lines
3.6 KiB
Diff
Index: virt-manager-2.2.1/virtinst/osdict.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtinst/osdict.py
|
|
+++ virt-manager-2.2.1/virtinst/osdict.py
|
|
@@ -54,7 +54,7 @@ def _sort(tosort):
|
|
distro_mappings = {}
|
|
retlist = []
|
|
|
|
- for key, osinfo in tosort.items():
|
|
+ for key, osinfo in list(tosort.items()):
|
|
# Libosinfo has some duplicate version numbers here, so append .1
|
|
# if there's a collision
|
|
sortby = _sortby(osinfo)
|
|
Index: virt-manager-2.2.1/virtinst/install/installertreemedia.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtinst/install/installertreemedia.py
|
|
+++ virt-manager-2.2.1/virtinst/install/installertreemedia.py
|
|
@@ -20,7 +20,7 @@ from ..osdict import OSDB
|
|
(MEDIA_DIR,
|
|
MEDIA_ISO,
|
|
MEDIA_URL,
|
|
- MEDIA_KERNEL) = range(1, 5)
|
|
+ MEDIA_KERNEL) = list(range(1, 5))
|
|
|
|
|
|
def _is_url(url):
|
|
Index: virt-manager-2.2.1/virtinst/xmlbuilder.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtinst/xmlbuilder.py
|
|
+++ virt-manager-2.2.1/virtinst/xmlbuilder.py
|
|
@@ -661,7 +661,7 @@ class XMLBuilder(object):
|
|
whenever child objects are added or removed
|
|
"""
|
|
typecount = {}
|
|
- for propname, xmlprop in self._all_child_props().items():
|
|
+ for propname, xmlprop in list(self._all_child_props().items()):
|
|
for obj in xmlutil.listify(getattr(self, propname)):
|
|
idxstr = ""
|
|
if not xmlprop.is_single:
|
|
Index: virt-manager-2.2.1/virtinst/domcapabilities.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtinst/domcapabilities.py
|
|
+++ virt-manager-2.2.1/virtinst/domcapabilities.py
|
|
@@ -218,7 +218,7 @@ class DomainCapabilities(XMLBuilder):
|
|
return _("BIOS")
|
|
return _("None")
|
|
|
|
- for arch, patterns in self._uefi_arch_patterns.items():
|
|
+ for arch, patterns in list(self._uefi_arch_patterns.items()):
|
|
for pattern in patterns:
|
|
if re.match(pattern, path):
|
|
return (_("UEFI %(arch)s: %(path)s") %
|
|
Index: virt-manager-2.2.1/virtinst/devices/disk.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtinst/devices/disk.py
|
|
+++ virt-manager-2.2.1/virtinst/devices/disk.py
|
|
@@ -269,7 +269,7 @@ class DeviceDisk(Device):
|
|
digit = 1
|
|
|
|
seen_valid = True
|
|
- gen_t += "%c" % (ord('a') + digit - 1)
|
|
+ gen_t += "%c" % int(ord('a') + digit - 1)
|
|
|
|
return gen_t
|
|
|
|
@@ -879,11 +879,11 @@ class DeviceDisk(Device):
|
|
def get_target():
|
|
first_found = None
|
|
|
|
- ran = range(maxnode)
|
|
+ ran = list(range(maxnode))
|
|
if pref_ctrl is not None:
|
|
# We assume narrow SCSI bus and libvirt assigning 7
|
|
# (1-7, 8-14, etc.) devices per controller
|
|
- ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
|
|
+ ran = list(range(pref_ctrl * 7, (pref_ctrl + 1) * 7))
|
|
|
|
for i in ran:
|
|
postfix = self.num_to_target(i + 1)
|
|
Index: virt-manager-2.2.1/virtinst/pollhelpers.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtinst/pollhelpers.py
|
|
+++ virt-manager-2.2.1/virtinst/pollhelpers.py
|
|
@@ -129,7 +129,7 @@ def fetch_pools(backend, origmap, build_
|
|
for obj in objs:
|
|
try:
|
|
obj.refresh(0)
|
|
- except Exception, e:
|
|
+ except Exception as e:
|
|
pass
|
|
|
|
return _new_poll_helper(origmap, name,
|