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:
|