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
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
Subject: Do not compare between None and int
|
|
From: Radostin Stoyanov rstoyanov1@gmail.com Wed Oct 11 12:35:54 2017 +0100
|
|
Date: Fri Oct 20 13:18:31 2017 -0400:
|
|
Git: a2bcd6c43a77b03693d11d231e8c0a7b0609889b
|
|
|
|
In Python 2 comparison between int and None is allowed but in
|
|
Pyhton 3 it is not.
|
|
|
|
Example:
|
|
|
|
Pyhton 2
|
|
|
|
>>> None > 0
|
|
False
|
|
|
|
Python 3
|
|
|
|
>>> None > 0
|
|
Traceback (most recent call last):
|
|
File "<stdin>", line 1, in <module>
|
|
TypeError: '>' not supported between instances of 'NoneType' and 'int'
|
|
|
|
diff --git a/tests/utils.py b/tests/utils.py
|
|
index 7397d369..e9072bf4 100644
|
|
--- a/tests/utils.py
|
|
+++ b/tests/utils.py
|
|
@@ -181,7 +181,7 @@ def diff_compare(actual_out, filename=None, expect_out=None):
|
|
|
|
diff = "".join(difflib.unified_diff(expect_out.splitlines(1),
|
|
actual_out.splitlines(1),
|
|
- fromfile=filename,
|
|
+ fromfile=filename or '',
|
|
tofile="Generated Output"))
|
|
if diff:
|
|
raise AssertionError("Conversion outputs did not match.\n%s" % diff)
|
|
diff --git a/virtinst/support.py b/virtinst/support.py
|
|
index 19160fba..6b0489a5 100644
|
|
--- a/virtinst/support.py
|
|
+++ b/virtinst/support.py
|
|
@@ -187,7 +187,8 @@ class _SupportCheck(object):
|
|
actual_hv_version = conn.conn_version()
|
|
|
|
# Check that local libvirt version is sufficient
|
|
- if _version_str_to_int(self.version) > actual_libvirt_version:
|
|
+ v = _version_str_to_int(self.version)
|
|
+ if v and (v > actual_libvirt_version):
|
|
return False
|
|
|
|
if self.hv_version:
|