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
70 lines
2.5 KiB
Diff
70 lines
2.5 KiB
Diff
Subject: manager: Drop python2 only cmp() usage
|
|
From: Cole Robinson crobinso@redhat.com Sat Oct 21 19:18:02 2017 -0400
|
|
Date: Sat Oct 21 19:41:33 2017 -0400:
|
|
Git: d82022bd2cc805f11eaea3dc8b506678b3fdb3d5
|
|
|
|
Manually implement it
|
|
|
|
diff --git a/virtManager/manager.py b/virtManager/manager.py
|
|
index 73fe6ea7..c257af28 100644
|
|
--- a/virtManager/manager.py
|
|
+++ b/virtManager/manager.py
|
|
@@ -66,6 +66,10 @@ def _style_get_prop(widget, propname):
|
|
return value.get_int()
|
|
|
|
|
|
+def _cmp(a, b):
|
|
+ return ((a > b) - (a < b))
|
|
+
|
|
+
|
|
def _get_inspection_icon_pixbuf(vm, w, h):
|
|
# libguestfs gives us the PNG data as a string.
|
|
png_data = vm.inspection.icon
|
|
@@ -911,40 +915,40 @@ class vmmManager(vmmGObjectUI):
|
|
def vmlist_name_sorter(self, model, iter1, iter2, ignore):
|
|
key1 = str(model[iter1][ROW_SORT_KEY]).lower()
|
|
key2 = str(model[iter2][ROW_SORT_KEY]).lower()
|
|
- return cmp(key1, key2)
|
|
+ return _cmp(key1, key2)
|
|
|
|
def vmlist_guest_cpu_usage_sorter(self, model, iter1, iter2, ignore):
|
|
obj1 = model[iter1][ROW_HANDLE]
|
|
obj2 = model[iter2][ROW_HANDLE]
|
|
|
|
- return cmp(obj1.guest_cpu_time_percentage(),
|
|
+ return _cmp(obj1.guest_cpu_time_percentage(),
|
|
obj2.guest_cpu_time_percentage())
|
|
|
|
def vmlist_host_cpu_usage_sorter(self, model, iter1, iter2, ignore):
|
|
obj1 = model[iter1][ROW_HANDLE]
|
|
obj2 = model[iter2][ROW_HANDLE]
|
|
|
|
- return cmp(obj1.host_cpu_time_percentage(),
|
|
+ return _cmp(obj1.host_cpu_time_percentage(),
|
|
obj2.host_cpu_time_percentage())
|
|
|
|
def vmlist_memory_usage_sorter(self, model, iter1, iter2, ignore):
|
|
obj1 = model[iter1][ROW_HANDLE]
|
|
obj2 = model[iter2][ROW_HANDLE]
|
|
|
|
- return cmp(obj1.stats_memory(),
|
|
+ return _cmp(obj1.stats_memory(),
|
|
obj2.stats_memory())
|
|
|
|
def vmlist_disk_io_sorter(self, model, iter1, iter2, ignore):
|
|
obj1 = model[iter1][ROW_HANDLE]
|
|
obj2 = model[iter2][ROW_HANDLE]
|
|
|
|
- return cmp(obj1.disk_io_rate(), obj2.disk_io_rate())
|
|
+ return _cmp(obj1.disk_io_rate(), obj2.disk_io_rate())
|
|
|
|
def vmlist_network_usage_sorter(self, model, iter1, iter2, ignore):
|
|
obj1 = model[iter1][ROW_HANDLE]
|
|
obj2 = model[iter2][ROW_HANDLE]
|
|
|
|
- return cmp(obj1.network_traffic_rate(), obj2.network_traffic_rate())
|
|
+ return _cmp(obj1.network_traffic_rate(), obj2.network_traffic_rate())
|
|
|
|
def enable_polling(self, column):
|
|
# pylint: disable=redefined-variable-type
|