Message ID | 20190518040054.230179-18-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 0199d19349ee0e5cc65dae4a453eb9c4074fb685 |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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="mZuR4pYI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 455Wpx6691z9s4Y for <incoming@patchwork.ozlabs.org>; Sat, 18 May 2019 14:08:09 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7026EC21D83; Sat, 18 May 2019 04:07:32 +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 D8614C21E49; Sat, 18 May 2019 04:01:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 14282C21E08; Sat, 18 May 2019 04:01:32 +0000 (UTC) Received: from mail-it1-f193.google.com (mail-it1-f193.google.com [209.85.166.193]) by lists.denx.de (Postfix) with ESMTPS id F2DF0C21E49 for <u-boot@lists.denx.de>; Sat, 18 May 2019 04:01:28 +0000 (UTC) Received: by mail-it1-f193.google.com with SMTP id m140so15212810itg.2 for <u-boot@lists.denx.de>; Fri, 17 May 2019 21:01:28 -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=CcxnHhdNA9G8BnQHDVOuQNilSvyXCfolmj6Wn5C33/g=; b=mZuR4pYIkBFdr7BvpnIVfQiERzKCe63Y/+MyV6kXk4CUHaT1dV80hE455piUSz7xpM Rfwf8UQIsDo8Yur0meTILlG3cRqlR7F596qY6U+2vYiIaGH+SyI4B44Ke8DjIv4Hpxo6 fY4ioyoLqBE4jU6n8uMDIg/vKVBNd2tt2dZ18= 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=CcxnHhdNA9G8BnQHDVOuQNilSvyXCfolmj6Wn5C33/g=; b=fDpScjNHYh+yGC2fG8xMsFuFtoA5eVDU1WgmRZTlogK4rqAoF9WWHggiF2ZxpqPlPZ +7qLqY8/l6iwaaLqhdIPYlGZxjj8FbclvD33hedeVltXVqxufRrQo8e9bv7KToICe078 YJ7aAPREG23U8gsZb11ltotd4G6o5YYL66GXM1eBhsDThzWeFzyhuSGpVWmUJuOUCdgB HYPngQCwX8W+mfyEZDwFtYR9FiXtRnyOQJaBrDNv0SFlVbtV4lBYikb8f0cKYjkLenVQ zIV4n92nOBhjRYHN8MekqHPJiRKzJNmhhNOmmpAFRnFisJphwucJNUveQR+AYFoxQplL cyYQ== X-Gm-Message-State: APjAAAVJP0POb5mpg2XOtjqiSvuZ7ZCusWE18GPQCZGb3yibYqUZtZFS DpnWN6/4cDUfHXCb8v0Cy0JLeyR91PM= X-Google-Smtp-Source: APXvYqyOyXn3fW6nzn6tqTXpytu1ZI4xPaDL2c1ZM++KY6H+v/GsaCBhoYgSqYduyWUeXD004/nBCw== X-Received: by 2002:a24:7a90:: with SMTP id a138mr20169707itc.95.1558152087849; Fri, 17 May 2019 21:01:27 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2019 21:01:27 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Fri, 17 May 2019 22:00:47 -0600 Message-Id: <20190518040054.230179-18-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 <trini@konsulko.com> Subject: [U-Boot] [PATCH 17/24] binman: Update entry_test to support Python 3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
binman: dtoc: Convert to Python 3
|
expand
|
diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py index 1f7ff5b4e41..b30a7beecc8 100644 --- a/tools/binman/entry_test.py +++ b/tools/binman/entry_test.py @@ -41,7 +41,11 @@ class TestEntry(unittest.TestCase): del sys.modules['importlib'] global entry if entry: - reload(entry) + if sys.version_info[0] >= 3: + import importlib + importlib.reload(entry) + else: + reload(entry) else: import entry entry.Entry.Create(None, self.GetNode(), 'u-boot-spl')
The reload() function is in a different place in Python 3. Update the code to handle this. Signed-off-by: Simon Glass <sjg@chromium.org> --- tools/binman/entry_test.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)