lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 18/36] tools/kvm_stat: fix python3 issues
    Date
    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>
    ---
    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 32283d88701a..40cf64c7ac3b 100755
    --- 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()

    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-24 16:58    [W:4.395 / U:0.832 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site