virt-manager/virttests-python2-to-python3-conversion.patch
Charles Arnold c085d819a8 - Update to virt-manager 1.5.0 (bsc#1027942)
virt-manager-1.5.0.tar.bz2
  * python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat)
  * Switch –location ISO to use isoinfo (Andrew Wong)
  * virt-install: add –cpu numa distance handling (Menno Lageman)
  * virt-install: fix –disk for rbd volumes with auth (Rauno Väli)
  * virt-install: add –cputune vcpupin handling (Wim ten Have)
  * details ui: Showing attached scsi devices per controller (Lin Ma)
  * network ui: Show details about SR-IOV VF pool (Lin Ma)
  * Greatly expand UI test suite coverage
- Dropped patches
  0001-Improve-container-image-url-example.patch
  0001-py3-store-exception-variables-for-use-outside-except.patch
  0002-create-wizard-fix-alignment-in-os-container-page.patch
  0003-oscontainer-ask-root-password-in-the-wizard.patch
  0004-Harmonize-invisible_char-values.patch
  083dfcc8-Show-details-about-the-network-of-SR-IOV-VF-pool.patch
  08a58d61-pycodestyle-remove-description-of-fixed-errors.patch
  0c6bcb09-fix-bytes-string-mess-in-serial-console.patch
  0e812e3c-dont-skip-authentication-for-listen-type-none-with-fixed-QEMU.patch
  23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch
  2d276ebe-progress-dont-overwrite-format.patch
  2eb455c9-correctly-calculate-virtio-scsi-controller-index.patch
  374a3779-urlfetcher-write-test-file-as-binary-content.patch
  37ea5207-replace-StandardError-with-Exception.patch
  3b769643-dont-add-URI-into-params-for-tunneled-migration.patch
  3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch
  44de92b7-use-reload-from-imp-module.patch
  63fce081-pycodestyle-Use-isinstance-for-type-checking.patch
  67122615-python2to3-division-compatability.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=406
2018-02-07 16:59:50 +00:00

112 lines
3.7 KiB
Diff

Index: virt-manager-1.5.0/tests/clitest.py
===================================================================
--- virt-manager-1.5.0.orig/tests/clitest.py
+++ virt-manager-1.5.0/tests/clitest.py
@@ -223,7 +223,7 @@ class Command(object):
try:
conn = None
- for idx in reversed(range(len(self.argv))):
+ for idx in reversed(list(range(len(self.argv)))):
if self.argv[idx] == "--connect":
conn = utils.openconn(self.argv[idx + 1])
break
Index: virt-manager-1.5.0/tests/uitests/utils.py
===================================================================
--- virt-manager-1.5.0.orig/tests/uitests/utils.py
+++ virt-manager-1.5.0/tests/uitests/utils.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+
import logging
import os
Index: virt-manager-1.5.0/tests/utils.py
===================================================================
--- virt-manager-1.5.0.orig/tests/utils.py
+++ virt-manager-1.5.0/tests/utils.py
@@ -104,11 +104,11 @@ def openconn(uri):
conn.fetch_all_nodedevs()
_conn_cache[uri] = {}
- for key, value in conn._fetch_cache.items():
+ for key, value in list(conn._fetch_cache.items()):
_conn_cache[uri][key] = value[:]
# Prime the internal connection cache
- for key, value in _conn_cache[uri].items():
+ for key, value in list(_conn_cache[uri].items()):
conn._fetch_cache[key] = value[:]
def cb_cache_new_pool(poolobj):
Index: virt-manager-1.5.0/tests/test_inject.py
===================================================================
--- virt-manager-1.5.0.orig/tests/test_inject.py
+++ virt-manager-1.5.0/tests/test_inject.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python2
# Copyright (C) 2013, 2014 Red Hat, Inc.
-from __future__ import print_function
+
import atexit
import os
@@ -30,7 +30,7 @@ FEDORA_URL = "http://dl.fedoraproject.or
(WARN_RHEL4,
WARN_RHEL5,
- WARN_LATEST) = range(1, 4)
+ WARN_LATEST) = list(range(1, 4))
def prompt():
@@ -186,7 +186,7 @@ def _make_tests():
return lambda s: _test_distro(_d)
idx = 0
- for dname, dobj in _alldistros.items():
+ for dname, dobj in list(_alldistros.items()):
idx += 1
setattr(FetchTests, "testFetch%.3d_%s" %
(idx, dname.replace("-", "_")), _make_fetch_cb(dobj))
Index: virt-manager-1.5.0/tests/test_urls.py
===================================================================
--- virt-manager-1.5.0.orig/tests/test_urls.py
+++ virt-manager-1.5.0/tests/test_urls.py
@@ -253,7 +253,7 @@ def _make_tests():
vals.get("testshortcircuit", "0") == "1")
urls[d.name] = d
- keys = urls.keys()
+ keys = list(urls.keys())
keys.sort()
for key in keys:
distroobj = urls[key]
Index: virt-manager-1.5.0/tests/virtconvtest.py
===================================================================
--- virt-manager-1.5.0.orig/tests/virtconvtest.py
+++ virt-manager-1.5.0/tests/virtconvtest.py
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
-from __future__ import print_function
+
import glob
import io
Index: virt-manager-1.5.0/tests/nodedev.py
===================================================================
--- virt-manager-1.5.0.orig/tests/nodedev.py
+++ virt-manager-1.5.0/tests/nodedev.py
@@ -69,7 +69,7 @@ class TestNodeDev(unittest.TestCase):
def _testCompare(self, devname, vals, devxml=None):
def _compare(dev, vals, root=""):
- for attr in vals.keys():
+ for attr in list(vals.keys()):
expect = vals[attr]
actual = getattr(dev, attr)
if isinstance(expect, list):