| From foo@baz Thu Oct 4 12:33:16 PDT 2018 |
| From: Stefan Raspl <stefan.raspl@de.ibm.com> |
| Date: Fri, 24 Aug 2018 14:03:55 +0200 |
| Subject: tools/kvm_stat: fix python3 issues |
| |
| From: Stefan Raspl <stefan.raspl@de.ibm.com> |
| |
| [ Upstream commit 58f33cfe73076b6497bada4f7b5bda961ed68083 ] |
| |
| 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@linux.ibm.com> |
| Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/kvm/kvm_stat/kvm_stat | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/tools/kvm/kvm_stat/kvm_stat |
| +++ b/tools/kvm/kvm_stat/kvm_stat |
| @@ -724,7 +724,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 = [] |
| @@ -1119,10 +1119,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() |
| |
