From patchwork Sat May 18 04:00:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1101342 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="htfmNOcR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 455WgM4dtxz9s4Y for ; Sat, 18 May 2019 14:01:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5A2FDC21D83; Sat, 18 May 2019 04:01:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 17990C21E02; Sat, 18 May 2019 04:01:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DC0B3C21E1A; Sat, 18 May 2019 04:01:19 +0000 (UTC) Received: from mail-it1-f194.google.com (mail-it1-f194.google.com [209.85.166.194]) by lists.denx.de (Postfix) with ESMTPS id 19946C21E39 for ; Sat, 18 May 2019 04:01:19 +0000 (UTC) Received: by mail-it1-f194.google.com with SMTP id m3so11296902itl.1 for ; Fri, 17 May 2019 21:01:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QI04DiKkQwet3xi4YXjqTHeUGcZlv+jKPoSccwvohFY=; b=htfmNOcR9CkSM6O3WE9t+STc7ZffqrTMmRqv5NYZPE7Asn0yBs1E0KYzuuN6Aniph7 JIk2mGXV4pQYkIwa8KP0Nmhg98Kznu7ylV/AQqWECnWbjrbRRYouldBq01IWOCEBrGuw 2f8XkVFyOgozz+6EA46kM8Uy+xuTYFDSat7dw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QI04DiKkQwet3xi4YXjqTHeUGcZlv+jKPoSccwvohFY=; b=Elr66GORMkbwe1Fr6JD8GAlygZgcPHS3RG0RlabUpOZnNIAbyUda5fq+kje1K1luPz gYzIKpVHEc1VLj8YazFihQQeoQFFMPWczu/wIon0x9vynSfMBdfagkLTLO/uCFOGav9s FWcjxKjZhjBDDPvoqq2sWh4uUUFWjL0hgwugwAiTAXPpuvH36ECIzMhxvPRz0qVh/X0L sKQJGIoGr6rIolbVKoJmjUYyrTpYsrd3IuWGRHohliigX9LarkAPPBtBzxtkfEWOlvh0 U5gwqdTsYH5iqifYhnwTR2iUEXKx3Y3y63GQQLIa6fsB0Ces5BkLzmXrxVeirK4N6nsC DYkQ== X-Gm-Message-State: APjAAAXwaoBKI1vvSSKGTAbJ+H/VY/2CwY244qgv9B9NxQohC99bTw+e KRe5GeWhkVoyzzHZBH6IBGDd2j2biMg= X-Google-Smtp-Source: APXvYqwT7IzKtyc2agr+XJ1Pt3MNeq6q1oP65uALfAfe/+gstFUAwoEggV0E7EuBND26V//Vv60aQQ== X-Received: by 2002:a05:6638:221:: with SMTP id f1mr37833509jaq.1.1558152077787; Fri, 17 May 2019 21:01:17 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id e7sm1284986itc.44.2019.05.17.21.01.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2019 21:01:17 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 17 May 2019 22:00:31 -0600 Message-Id: <20190518040054.230179-2-sjg@chromium.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog In-Reply-To: <20190518040054.230179-1-sjg@chromium.org> References: <20190518040054.230179-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 01/24] dtoc: Adjust code for Python 3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Update a few things in this tool so that they support Python 3: - print statements - iteritems() - xrange() Signed-off-by: Simon Glass --- tools/dtoc/dtb_platdata.py | 4 ++-- tools/dtoc/dtoc.py | 8 +++++--- tools/dtoc/test_dtoc.py | 4 +++- tools/dtoc/test_fdt.py | 8 +++++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index 17a3dccb116..4aeeab6fba9 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -449,7 +449,7 @@ class DtbPlatdata(object): self.out(';\n') self.out('};\n') - for alias, struct_name in self._aliases.iteritems(): + for alias, struct_name in self._aliases.items(): if alias not in sorted(structs): self.out('#define %s%s %s%s\n'% (STRUCT_PREFIX, alias, STRUCT_PREFIX, struct_name)) @@ -498,7 +498,7 @@ class DtbPlatdata(object): vals.append(get_value(prop.type, val)) # Put 8 values per line to avoid very long lines. - for i in xrange(0, len(vals), 8): + for i in range(0, len(vals), 8): if i: self.buf(',\n\t\t') self.buf(', '.join(vals[i:i + 8])) diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py index 2277af9bf78..c1a1d3534d4 100755 --- a/tools/dtoc/dtoc.py +++ b/tools/dtoc/dtoc.py @@ -25,6 +25,8 @@ options. For more information about the use of this options and tool please see doc/driver-model/of-plat.txt """ +from __future__ import print_function + from optparse import OptionParser import os import sys @@ -64,11 +66,11 @@ def run_tests(args): suite = unittest.TestLoader().loadTestsFromTestCase(module) suite.run(result) - print result + print(result) for _, err in result.errors: - print err + print(err) for _, err in result.failures: - print err + print(err) def RunTestCoverage(): """Run the tests and check that we get 100% coverage""" diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index cb6d6e7baf9..ae59a0a52a1 100644 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -8,6 +8,8 @@ This includes unit tests for some functions and functional tests for the dtoc tool. """ +from __future__ import print_function + import collections import os import struct @@ -97,7 +99,7 @@ class TestDtoc(unittest.TestCase): if expected != actual: self._WritePythonString('/tmp/binman.expected', expected) self._WritePythonString('/tmp/binman.actual', actual) - print 'Failures written to /tmp/binman.{expected,actual}' + print('Failures written to /tmp/binman.{expected,actual}') self.assertEquals(expected, actual) def test_name(self): diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py index 8d70dd2a294..2d1d7dc452c 100755 --- a/tools/dtoc/test_fdt.py +++ b/tools/dtoc/test_fdt.py @@ -4,6 +4,8 @@ # Written by Simon Glass # +from __future__ import print_function + from optparse import OptionParser import glob import os @@ -535,11 +537,11 @@ def RunTests(args): suite = unittest.TestLoader().loadTestsFromTestCase(module) suite.run(result) - print result + print(result) for _, err in result.errors: - print err + print(err) for _, err in result.failures: - print err + print(err) if __name__ != '__main__': sys.exit(1)