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