lkml.org 
[lkml]   [2018]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 324/410] ia64: convert unwcheck.py to python3
    3.16.57-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Corentin Labbe <clabbe@baylibre.com>

    commit bd5edbe677948d0883f59d9625c444818d5284b1 upstream.

    Since my system use python3 as default, arch/ia64/scripts/unwcheck.py no
    longer run.

    This patch convert it to the python3 syntax.
    I have ran it with python2/python3 while printing values of
    start/end/rlen_sum which could be impacted by this change and I see no difference.

    Fixes: 94a47083522e ("scripts: change scripts to use system python instead of env")
    Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/ia64/scripts/unwcheck.py | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    --- a/arch/ia64/scripts/unwcheck.py
    +++ b/arch/ia64/scripts/unwcheck.py
    @@ -15,7 +15,7 @@ import re
    import sys

    if len(sys.argv) != 2:
    - print "Usage: %s FILE" % sys.argv[0]
    + print("Usage: %s FILE" % sys.argv[0])
    sys.exit(2)

    readelf = os.getenv("READELF", "readelf")
    @@ -28,7 +28,7 @@ def check_func (func, slots, rlen_sum):
    global num_errors
    num_errors += 1
    if not func: func = "[%#x-%#x]" % (start, end)
    - print "ERROR: %s: %lu slots, total region length = %lu" % (func, slots, rlen_sum)
    + print("ERROR: %s: %lu slots, total region length = %lu" % (func, slots, rlen_sum))
    return

    num_funcs = 0
    @@ -42,23 +42,23 @@ for line in os.popen("%s -u %s" % (reade
    check_func(func, slots, rlen_sum)

    func = m.group(1)
    - start = long(m.group(2), 16)
    - end = long(m.group(3), 16)
    + start = int(m.group(2), 16)
    + end = int(m.group(3), 16)
    slots = 3 * (end - start) / 16
    - rlen_sum = 0L
    + rlen_sum = 0
    num_funcs += 1
    else:
    m = rlen_pattern.match(line)
    if m:
    - rlen_sum += long(m.group(1))
    + rlen_sum += int(m.group(1))
    check_func(func, slots, rlen_sum)

    if num_errors == 0:
    - print "No errors detected in %u functions." % num_funcs
    + print("No errors detected in %u functions." % num_funcs)
    else:
    if num_errors > 1:
    err="errors"
    else:
    err="error"
    - print "%u %s detected in %u functions." % (num_errors, err, num_funcs)
    + print("%u %s detected in %u functions." % (num_errors, err, num_funcs))
    sys.exit(1)
    \
     
     \ /
      Last update: 2018-06-07 16:28    [W:3.622 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site