From patchwork Thu Jan 7 04:35:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1423147 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=n14zYtCg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DBD1p205rz9sVm for ; Thu, 7 Jan 2021 15:35:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BA0BA827C3; Thu, 7 Jan 2021 05:35:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="n14zYtCg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E0333827AE; Thu, 7 Jan 2021 05:35:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 21A918278A for ; Thu, 7 Jan 2021 05:35:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id x15so5573079ilq.1 for ; Wed, 06 Jan 2021 20:35:26 -0800 (PST) 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=mCq7su9acgMGLANrjxcV2uoDWsMhc3VvjN4q6yk1lgY=; b=n14zYtCgklIph7gmF2yN1eCl//8aib3Ib3+E4M3TOp8p1uf1sNLNYVLSONQzwGLOvm NasUoTrg1nkmLuus5CtwQovXqqBB0gV+38LyQsvAfQBSjqVsQMqgN6AG9mM4sxZPxVk5 BsBvANnEXUnTNt5qnTdrndlw1hFAT+3jIPbrU= 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=mCq7su9acgMGLANrjxcV2uoDWsMhc3VvjN4q6yk1lgY=; b=nlI0uscwGYfQwCm0zMt6GXjfbQQWpqvGhPSuJCGobLXoHskv0WWTwMGSk1lbpqr0Rn +VDST5F7HY7JOI7/1rZUQou/UUJnHhc98ahviAXSoMp+0e4v484q66A6FTQgbhikr+T4 3TFiozVckhCuRJnheczThZjDOf0/s6eTmItIr1G7Vdi8zD6yDMRACX8fmdtsUBQ9it7c 2DYCToQPEOAswN51g8vgq/nqua1KrT12kO6UYTm5EprfgWicWUYkZG15dO8HrA9lVLSQ 2JrniaH0/q59vxbqTP8m+C1F2FCeqXR+TxrX4UexLsZGMyGIDkXE0PCF91IFzmUVoJ0f IOCw== X-Gm-Message-State: AOAM533UBAb2L2TkIBQp0UHVP4JujTwNRr0O0TRcm26nllOIze9PD/Ry iQS4Rq40Ws5TBMLwd6HJtmDD6Ym3tiFwPuaQ X-Google-Smtp-Source: ABdhPJxG5wei4CI+gvxPcmnhkblbOiZ38/trm9hLqeuwbYNbiN7Kuq2X49Aa6r2iNpvMjiMQ6OApeQ== X-Received: by 2002:a92:4019:: with SMTP id n25mr7339944ila.25.1609994124808; Wed, 06 Jan 2021 20:35:24 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id l78sm3724562ild.30.2021.01.06.20.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jan 2021 20:35:24 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass Subject: [PATCH 01/10] dtoc: binman: Drop Python 2 code Date: Wed, 6 Jan 2021 21:35:10 -0700 Message-Id: <20210107043519.2634625-2-sjg@chromium.org> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog In-Reply-To: <20210107043519.2634625-1-sjg@chromium.org> References: <20210107043519.2634625-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Drop a few more Python 2 relics that are no-longer needed. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- tools/binman/fmap_util.py | 4 ++-- tools/dtoc/fdt.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/binman/fmap_util.py b/tools/binman/fmap_util.py index b03fc28fbb4..8277619768c 100644 --- a/tools/binman/fmap_util.py +++ b/tools/binman/fmap_util.py @@ -53,8 +53,8 @@ FmapArea = collections.namedtuple('FmapArea', FMAP_AREA_NAMES) def NameToFmap(name): - if type(name) == bytes and sys.version_info[0] >= 3: - name = name.decode('utf-8') # pragma: no cover (for Python 2) + if type(name) == bytes: + name = name.decode('utf-8') return name.replace('\0', '').replace('-', '_').upper() def ConvertName(field_names, fields): diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index 4a78c737252..965106a3b28 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -460,8 +460,7 @@ class Node: prop_name: Name of property to add val: String value of property """ - if sys.version_info[0] >= 3: # pragma: no cover - val = bytes(val, 'utf-8') + val = bytes(val, 'utf-8') self.AddData(prop_name, val + b'\0') def AddSubnode(self, name):