APPLIED: [SRU][Bionic][Patch 1/2] tools/kvm_stat: fix python3 issues
Khaled Elmously
khalid.elmously at canonical.com
Fri Feb 1 03:18:33 UTC 2019
On 2019-01-15 11:17:53 , Juerg Haefliger wrote:
> From: Stefan Raspl <stefan.raspl at de.ibm.com>
>
> BugLink: https://bugs.launchpad.net/bugs/1798776
>
> Python3 returns a float for a regular division - switch to a division
> operator that returns an integer.
> Furthermore, filters return a generator object instead of the actual
> list - wrap result in yet another list, which makes it still work in
> both, Python2 and 3.
>
> Signed-off-by: Stefan Raspl <raspl at linux.ibm.com>
> Signed-off-by: Radim Krčmář <rkrcmar at redhat.com>
> (cherry picked from commit 58f33cfe73076b6497bada4f7b5bda961ed68083)
> Signed-off-by: Juerg Haefliger <juergh at canonical.com>
> ---
> tools/kvm/kvm_stat/kvm_stat | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat
> index 56c4b3f8a01b..e10b90a8917a 100755
> --- a/tools/kvm/kvm_stat/kvm_stat
> +++ b/tools/kvm/kvm_stat/kvm_stat
> @@ -759,7 +759,7 @@ class DebugfsProvider(Provider):
> if len(vms) == 0:
> self.do_read = False
>
> - self.paths = filter(lambda x: "{}-".format(pid) in x, vms)
> + self.paths = list(filter(lambda x: "{}-".format(pid) in x, vms))
>
> else:
> self.paths = []
> @@ -1219,10 +1219,10 @@ class Tui(object):
> (x, term_width) = self.screen.getmaxyx()
> row = 2
> for line in text:
> - start = (term_width - len(line)) / 2
> + start = (term_width - len(line)) // 2
> self.screen.addstr(row, start, line)
> row += 1
> - self.screen.addstr(row + 1, (term_width - len(hint)) / 2, hint,
> + self.screen.addstr(row + 1, (term_width - len(hint)) // 2, hint,
> curses.A_STANDOUT)
> self.screen.getkey()
>
> --
> 2.19.1
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
More information about the kernel-team
mailing list