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
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
Subject: Import reduce() from functools module
|
|
From: Radostin Stoyanov rstoyanov1@gmail.com Wed Oct 11 12:35:59 2017 +0100
|
|
Date: Fri Oct 20 13:18:31 2017 -0400:
|
|
Git: 69c84bea474c3563975c1f2bfe160a436def020a
|
|
|
|
The built-in function reduce() [1] has been moved in the functools
|
|
module [2] [3].
|
|
|
|
[1] https://docs.python.org/2/library/functions.html#reduce
|
|
[2] https://docs.python.org/3/library/functools.html#functools.reduce
|
|
[3] https://docs.python.org/2/library/functools.html#functools.reduce
|
|
|
|
diff --git a/virtManager/host.py b/virtManager/host.py
|
|
index 560bc0a6..2f22642b 100644
|
|
--- a/virtManager/host.py
|
|
+++ b/virtManager/host.py
|
|
@@ -18,6 +18,7 @@
|
|
# MA 02110-1301 USA.
|
|
#
|
|
|
|
+import functools
|
|
import logging
|
|
|
|
from gi.repository import GObject
|
|
@@ -931,7 +932,7 @@ class vmmHost(vmmGObjectUI):
|
|
|
|
addrstr = "-"
|
|
if ipv6[2]:
|
|
- addrstr = reduce(lambda x, y: x + "\n" + y, ipv6[2])
|
|
+ addrstr = functools.reduce(lambda x, y: x + "\n" + y, ipv6[2])
|
|
|
|
self.widget("interface-ipv6-mode").set_text(mode)
|
|
self.widget("interface-ipv6-address").set_text(addrstr)
|
|
diff --git a/virtManager/sshtunnels.py b/virtManager/sshtunnels.py
|
|
index 7f825b86..b00b1889 100644
|
|
--- a/virtManager/sshtunnels.py
|
|
+++ b/virtManager/sshtunnels.py
|
|
@@ -17,6 +17,7 @@
|
|
# MA 02110-1301 USA.
|
|
#
|
|
|
|
+import functools
|
|
import logging
|
|
import os
|
|
import Queue
|
|
@@ -261,7 +262,7 @@ def _make_ssh_command(ginfo):
|
|
argv.append("sh -c")
|
|
argv.append("'%s'" % nc_cmd)
|
|
|
|
- argv_str = reduce(lambda x, y: x + " " + y, argv[1:])
|
|
+ argv_str = functools.reduce(lambda x, y: x + " " + y, argv[1:])
|
|
logging.debug("Pre-generated ssh command for ginfo: %s", argv_str)
|
|
return argv
|
|
|