From patchwork Sun Jun 7 12:45:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1304683 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=L9hzBLvW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 49fx2f6g2Zz9sQx for ; Sun, 7 Jun 2020 22:46:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9D4A08047E; Sun, 7 Jun 2020 14:46:11 +0200 (CEST) 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="L9hzBLvW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B498480680; Sun, 7 Jun 2020 14:46:06 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) (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 E4597801CA for ; Sun, 7 Jun 2020 14:46:02 +0200 (CEST) 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-io1-xd36.google.com with SMTP id o5so15504116iow.8 for ; Sun, 07 Jun 2020 05:46:02 -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=zTnufRwuiec2Krl7bD2Jt1saHx78r1PzvD4gQAQ9mGQ=; b=L9hzBLvWW1KvFR158jPuFEPTVGIC48gBBimWpHYbaCDyQWnO9BlrusBeiMbr8eUMpg V/X5RaMAEizwzGFyH9Zs8u5CYY8wCiIkG1r+1kB6qZlEv9I/zETisZPc0dyEFKvIwn4Q RKo9GKA+6AeCTyDSGrw04yknrcS/VnVQ3V8z0= 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=zTnufRwuiec2Krl7bD2Jt1saHx78r1PzvD4gQAQ9mGQ=; b=adSqYWTK9jF7Lo2MOTtbLr9UxaY1EJd4aZFEcXvX/4Q3vOfjaBx8FF+puHB7gwajN5 xvDopUGrROqUNPAFU+b0xOF8Rdhgda/IQqn1KXBKqtgfa9v2fo99dPbu/lPY5foIqaWU 4rhM4AnWywFcXFI8cmv4wRqoUU5edhcBXOGU+pBHXfkmBoNmercXoOOSqWJomsRhIve8 Qzzfg6q90vVzH4mpm9xuFKypZmzmEz1jNcZ+/dQJUcqFPyfQ9ZBRYwsmlxVFusc0zUj8 vi0frR8IxhYMpC/KpcXvWlwf/ZbcKwiZahGCzQaMXkxWl7NZLHgqMF4dX2clO1Ly7V95 SuCA== X-Gm-Message-State: AOAM533h7f6Ysg+jy1jlleyyMJhNkSkF+QRkUZ81A6j4QwKWBfMHgf7D k/c63ZYjNKiKTQkj/9sLkl9tiF5YVbMv7Q== X-Google-Smtp-Source: ABdhPJzbNyd0aPSR+VCg6+1wtuSXUAqq1+69RyvOPYZY9XLePQCw5Io6axEDui2W0ed4EE6vjYyLPA== X-Received: by 2002:a6b:5915:: with SMTP id n21mr17362592iob.103.1591533961570; Sun, 07 Jun 2020 05:46:01 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id v15sm6354969ila.57.2020.06.07.05.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 05:46:01 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Stefan Bosch , Simon Glass Subject: [PATCH v4 1/6] patman: Drop unnecessary import in gitutil Date: Sun, 7 Jun 2020 06:45:45 -0600 Message-Id: <20200607124550.212732-2-sjg@chromium.org> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200607124550.212732-1-sjg@chromium.org> References: <20200607124550.212732-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean The checkpatch module is not used, so drop it. Signed-off-by: Simon Glass Reported-by: Stefan Bosch Signed-off-by: Simon Glass Reported-by: Stefan Bosch --- (no changes since v3) Changes in v3: - Split out the gitutil change into a separate patch tools/patman/gitutil.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 72fc95d558..c9ceb28a05 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -7,7 +7,6 @@ import os import subprocess import sys -from patman import checkpatch from patman import command from patman import series from patman import settings From patchwork Sun Jun 7 12:45:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1304684 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=SfemtGRW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 49fx2s2kPCz9sQx for ; Sun, 7 Jun 2020 22:46:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA101813A9; Sun, 7 Jun 2020 14:46:13 +0200 (CEST) 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="SfemtGRW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5B13C810E0; Sun, 7 Jun 2020 14:46:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) (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 87B6A801D8 for ; Sun, 7 Jun 2020 14:46:03 +0200 (CEST) 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-io1-xd42.google.com with SMTP id q8so15533990iow.7 for ; Sun, 07 Jun 2020 05:46:03 -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=pbNPapvyHk/pSDYSvqkYom8DYTFUzCAZ+MSb7ItWB+Q=; b=SfemtGRWG3UjukMAza4JRkq5WaSH3hOwQR55UMIbZ02G/U8ZlYcEq2CIkaKOGgq/Lh EsXApe8skNHjvOMke20bQQTkViNI+nPC6r5tDx+sBvEBJZx38j8oGE8if1IgyQR1bZGp Vgz+1DBC9kVaQGPbAG5icWNNAqQj8sSfSjQOo= 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=pbNPapvyHk/pSDYSvqkYom8DYTFUzCAZ+MSb7ItWB+Q=; b=K7ZsAi0kYmeC9qg4J0wkUehfuAFa1TWBYewJ8I6rHF2jdXkPsccXrAbtjAUpnPgyWG KQovBxxsL9ZdjDfRdzise0p1AX6MmGI0/VyyaTz8ZD2FnT0uf9fHlHdNmsTsDwF/ONP5 D/gful40E4USL6JHV4vISNZ50G9ButCrzjDbVOv6DyTQkrrg3++TacCGDLruKmn0/Jla iwVyo9RU3vlMPI73jwWH7KW6Ah7N2sZXROP0Co/CB+DCFYpzKLKAfUFhWZHKZyz3chOp iBydnlPO5r0Q5CJXsctREqJu6t2iX5vfYmMw8GuHJ5U5ZouNrWJNoj4KOKjwhM87VNLp 84Uw== X-Gm-Message-State: AOAM531a2mOG8X/k82EddqDl4cWaRrzGYUDRRXaLF3LZrqXvpGd0PujQ FNkUm5tJIFT3QIlaHA4IDNgs/8fcw656zQ== X-Google-Smtp-Source: ABdhPJxmAgPMMeg3deDhOIVFI4MUDCLmWKcP40MBewsz6UI6uCDZBippoCHSxIWXy7nil0bhV3YKQw== X-Received: by 2002:a5d:8516:: with SMTP id q22mr17002421ion.122.1591533962286; Sun, 07 Jun 2020 05:46:02 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id v15sm6354969ila.57.2020.06.07.05.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 05:46:02 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Stefan Bosch , Simon Glass Subject: [PATCH v4 2/6] patman: Avoid circular dependency between command and tools Date: Sun, 7 Jun 2020 06:45:46 -0600 Message-Id: <20200607124550.212732-3-sjg@chromium.org> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200607124550.212732-1-sjg@chromium.org> References: <20200607124550.212732-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This seems to cause problems in some cases. Split the dependency by copying the code to command. Reported-by: Stefan Bosch Signed-off-by: Simon Glass Reported-by: Stefan Bosch Signed-off-by: Simon Glass --- (no changes since v1) tools/patman/command.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/patman/command.py b/tools/patman/command.py index e67ac159e5..bf8ea6c8c3 100644 --- a/tools/patman/command.py +++ b/tools/patman/command.py @@ -5,7 +5,6 @@ import os from patman import cros_subprocess -from patman import tools """Shell command ease-ups for Python.""" @@ -35,9 +34,9 @@ class CommandResult: def ToOutput(self, binary): if not binary: - self.stdout = tools.ToString(self.stdout) - self.stderr = tools.ToString(self.stderr) - self.combined = tools.ToString(self.combined) + self.stdout = self.stdout.decode('utf-8') + self.stderr = self.stderr.decode('utf-8') + self.combined = self.combined.decode('utf-8') return self From patchwork Sun Jun 7 12:45:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1304686 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=ANfXDgEI; 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 49fx3K00npz9sQx for ; Sun, 7 Jun 2020 22:46:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 54443813C3; Sun, 7 Jun 2020 14:46:18 +0200 (CEST) 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="ANfXDgEI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6F43C812EE; Sun, 7 Jun 2020 14:46:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 5980080462 for ; Sun, 7 Jun 2020 14:46:04 +0200 (CEST) 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-io1-xd32.google.com with SMTP id p20so15491711iop.11 for ; Sun, 07 Jun 2020 05:46:04 -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=2rPm0hNuEt08BDbEQMVEaEg2rOS68GAHNNkJ+249xbo=; b=ANfXDgEIZvEXqRJioW8inVlmkuhKxgxiMU2y4SO/K7FTYF4NKVRG+k26MxsS+URs3w e1XhYMOwCGfdTyh0Uxnns43lu6nzoqh8lngN3k9Ndfmy2yksOqDmRVMfBAvyw2WslAu7 L6oGJNiQ1yPYhpFN1Agr1C+suqveOePHg40+E= 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=2rPm0hNuEt08BDbEQMVEaEg2rOS68GAHNNkJ+249xbo=; b=hoz4oHHXnHoDZEPOomRF/8fJ2Q89Fmaj/g/XReyo5P3z1L3cGHcoz7va9NhLAQ8DJ5 NWHIwe4XjnYiffid6bHkkkALNECQI4u0rMosPYJOsS3qUqtht2Rvz7nvW894351z5Bn/ PzBfjfY6Kz3PRdkf+jaqKXu7tkz8tIJ/zi5wQkhjkgJVB+GiQFxR4F0XotHnoSl8nlZC mGrILuDD86E28s0Nkca3JpYBXMJe6WZd6dA+0RK1kKZ+KvqZyBKJJOkqCkXTkFpjQa1t v5FQwkLDG7T7c0LBP5Kdbu8vzDFNQuK/0cEFVXdd1Nak8chaR8BNL8Z4G8IJqnl5ZUUI 5AYg== X-Gm-Message-State: AOAM5308IQtuUnyITNFioHxZoYXN8RarHzH7fJa1534ZDu4tlcMlylHF O1NSQRtL5Zkg8VPrcj+29JakRW3i2PK01w== X-Google-Smtp-Source: ABdhPJxUIEA/TieiN4/diB8YBBUrEqkHPSeK535UZbIU4nbvqZ686z33DJFDB/1kTZI/yHMlIDFBDA== X-Received: by 2002:a6b:4113:: with SMTP id n19mr17352951ioa.187.1591533963089; Sun, 07 Jun 2020 05:46:03 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id v15sm6354969ila.57.2020.06.07.05.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 05:46:02 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Stefan Bosch , Simon Glass Subject: [PATCH v4 3/6] patman: Use a dict in gitutil to avoid importing series Date: Sun, 7 Jun 2020 06:45:47 -0600 Message-Id: <20200607124550.212732-4-sjg@chromium.org> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200607124550.212732-1-sjg@chromium.org> References: <20200607124550.212732-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Only a few members of this class are used and only in a test. To avoid importing the module, convert the test to use a dict. Signed-off-by: Simon Glass Reported-by: Stefan Bosch Signed-off-by: Simon Glass Reported-by: Stefan Bosch --- (no changes since v1) tools/patman/gitutil.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index c9ceb28a05..5189840eab 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -8,7 +8,6 @@ import subprocess import sys from patman import command -from patman import series from patman import settings from patman import terminal from patman import tools @@ -368,9 +367,9 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname, >>> alias['boys'] = ['fred', ' john'] >>> alias['all'] = ['fred ', 'john', ' mary '] >>> alias[os.getenv('USER')] = ['this-is-me@me.com'] - >>> series = series.Series() - >>> series.to = ['fred'] - >>> series.cc = ['mary'] + >>> series = {} + >>> series['to'] = ['fred'] + >>> series['cc'] = ['mary'] >>> EmailPatches(series, 'cover', ['p1', 'p2'], True, True, 'cc-fname', \ False, alias) 'git send-email --annotate --to "f.bloggs@napier.co.nz" --cc \ @@ -379,7 +378,7 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname, alias) 'git send-email --annotate --to "f.bloggs@napier.co.nz" --cc \ "m.poppins@cloud.net" --cc-cmd "./patman --cc-cmd cc-fname" p1' - >>> series.cc = ['all'] + >>> series['cc'] = ['all'] >>> EmailPatches(series, 'cover', ['p1', 'p2'], True, True, 'cc-fname', \ True, alias) 'git send-email --annotate --to "this-is-me@me.com" --cc-cmd "./patman \ From patchwork Sun Jun 7 12:45:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1304685 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=S0Z4RQQ2; 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 49fx344wBBz9sQx for ; Sun, 7 Jun 2020 22:46:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A1C9180476; Sun, 7 Jun 2020 14:46:16 +0200 (CEST) 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="S0Z4RQQ2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8FCA880462; Sun, 7 Jun 2020 14:46:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (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 2E0AF8067C for ; Sun, 7 Jun 2020 14:46:05 +0200 (CEST) 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-x129.google.com with SMTP id i1so12938276ils.11 for ; Sun, 07 Jun 2020 05:46:05 -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=CepnHOmAY1j0u3VOGOrr/i13ctuyv0icB3rxfxkxflY=; b=S0Z4RQQ2DPxETSyhiOSedkR1s79942g7EllgpKiUkE264WN5rtgQ4Dekj+UInUZAA5 IpP1dRr+5B5PNPm0CTRf1BMBmf9bcyyb3LaI0GRLimMd8NBYUTJ2uAojBvuSNo/+eRZD v5TCRRry8S7lCBYk3VXQIkGkNy8bIApMCJsyo= 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=CepnHOmAY1j0u3VOGOrr/i13ctuyv0icB3rxfxkxflY=; b=Iamfo7qpPGxkkChd/qB/6p9OX66FSVDJtA8R72fINy/GT5Bvdh27y9vb8pzZKodtw/ tLIwZxl7H/S9VDzSSLZQea5QrVmqcrfy2kQep/64HGz1EcGP+phIlXHL9BCMjienYJob SsYr9UFq9DPCxS0iw4OqGxpfof46/uel0AOxovO4WoIDPoAwffsM95/1M2M62Se5cW82 /rGIChv/Ch/vjS0IfMHue2XoObcpPsPIkdT44A293neTwPIO5UQKNzZnFMCUM7eNHfpZ YwPRtxG7r7L3P5VSKD5rOPW0WmcjnEoOkAbdL12DcG6a4u3rSx9X91d/CoAUmQg6vAFp mFJg== X-Gm-Message-State: AOAM533Q54572+uUJsUYT45igNmrIKxDRI07FW3nYW8TJDXLqExBOsK8 82pIS0t/x5Thjhe7HRL5/RXzTLxFgfVqRg== X-Google-Smtp-Source: ABdhPJwe9oklkr9/CXQGe43bD/X7n0LBCOClcY3DYAHUjnYmyrCvWCczuJwRuH9eMNML+dlW9G9M+Q== X-Received: by 2002:a92:5f9c:: with SMTP id i28mr18083870ill.25.1591533963804; Sun, 07 Jun 2020 05:46:03 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id v15sm6354969ila.57.2020.06.07.05.46.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 05:46:03 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Stefan Bosch , Simon Glass Subject: [PATCH v4 4/6] patman: Pass in maintainer dirs to avoid and import Date: Sun, 7 Jun 2020 06:45:48 -0600 Message-Id: <20200607124550.212732-5-sjg@chromium.org> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200607124550.212732-1-sjg@chromium.org> References: <20200607124550.212732-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Adjust the get_maintainer module to accept a list of directories to search for the script. This avoids needing to import gitutil. Signed-off-by: Simon Glass Reported-by: Stefan Bosch Signed-off-by: Simon Glass Reported-by: Stefan Bosch --- (no changes since v1) tools/patman/get_maintainer.py | 14 +++++++------- tools/patman/series.py | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/patman/get_maintainer.py b/tools/patman/get_maintainer.py index 473f0feebf..af4ba15bcd 100644 --- a/tools/patman/get_maintainer.py +++ b/tools/patman/get_maintainer.py @@ -5,17 +5,16 @@ import os from patman import command -from patman import gitutil -def FindGetMaintainer(): +def FindGetMaintainer(try_list): """Look for the get_maintainer.pl script. + Args: + try_list: List of directories to try for the get_maintainer.pl script + Returns: If the script is found we'll return a path to it; else None. """ - try_list = [ - os.path.join(gitutil.GetTopLevel(), 'scripts'), - ] # Look in the list for path in try_list: fname = os.path.join(path, 'get_maintainer.pl') @@ -24,7 +23,7 @@ def FindGetMaintainer(): return None -def GetMaintainer(fname, verbose=False): +def GetMaintainer(dir_list, fname, verbose=False): """Run get_maintainer.pl on a file if we find it. We look for get_maintainer.pl in the 'scripts' directory at the top of @@ -32,12 +31,13 @@ def GetMaintainer(fname, verbose=False): then we fail silently. Args: + dir_list: List of directories to try for the get_maintainer.pl script fname: Path to the patch file to run get_maintainer.pl on. Returns: A list of email addresses to CC to. """ - get_maintainer = FindGetMaintainer() + get_maintainer = FindGetMaintainer(dir_list) if not get_maintainer: if verbose: print("WARNING: Couldn't find get_maintainer.pl") diff --git a/tools/patman/series.py b/tools/patman/series.py index ca7ca556dc..b7eef37d03 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -263,7 +263,8 @@ class Series(dict): if type(add_maintainers) == type(cc): cc += add_maintainers elif add_maintainers: - cc += get_maintainer.GetMaintainer(commit.patch) + dir_list = [os.path.join(gitutil.GetTopLevel(), 'scripts')] + cc += get_maintainer.GetMaintainer(dir_list, commit.patch) for x in set(cc) & set(settings.bounces): print(col.Color(col.YELLOW, 'Skipping "%s"' % x)) cc = set(cc) - set(settings.bounces) From patchwork Sun Jun 7 12:45:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1304688 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=ZMAQZD66; 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 49fx3h3shZz9sQx for ; Sun, 7 Jun 2020 22:47:12 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6E9DF8158A; Sun, 7 Jun 2020 14:46:25 +0200 (CEST) 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="ZMAQZD66"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 89FA1810E0; Sun, 7 Jun 2020 14:46:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) (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 EDC468047E for ; Sun, 7 Jun 2020 14:46:05 +0200 (CEST) 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-io1-xd42.google.com with SMTP id c8so15563316iob.6 for ; Sun, 07 Jun 2020 05:46:05 -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=L7s+bc1uIPb8QXh5i18bH8PLk7ut2LjnJlEFkPlqPMo=; b=ZMAQZD66o0o2KQ2z1zXkXFf3fKcf73CKWpzGicHqeCtmABwr3AtILBKPRQ6xBoOSza Q1cPv+abvfoINZOmsQe4BoARg3fOpXMZRa7uEtK17NdBeeXzycaJN3Kpfj4KdJ5gidr8 +LFAUKbXVHJJgDQNjbCrDcDhD3gFboFPlUrQo= 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=L7s+bc1uIPb8QXh5i18bH8PLk7ut2LjnJlEFkPlqPMo=; b=KEMxhfPAsJqCtCWLWbZN9TgQ/oE4eLtOiKyrcF8NhKKoKAzzDukbWMtFAbXuo8DUrT JYH50lScTp/Hh0utUR9dasajD1nh2j05Jv895w3Jm9eGq+EXj/k3+rkEd1RrI2inRvc+ Ns3vCAhKKqW4SbhhAvDEcR4HjA6S8Qm4tusbkthq8Vkn/LuXFqJjt6zx9RH6jrlQ1PUq rvcnhf7Omj9T2col/71cm/39Z/E3jv/s5ET32q4Q9sHkVkYPGvo5KMf3bc+Y3ZYklXgr Hk8y9N3tDe2JzaHR2uudD+zYK4AlVA73hJQVuVbPLayBPc0+grGakre88eQsy+YqRfsT cx4A== X-Gm-Message-State: AOAM5331U5IFgYYuijT/PfHv4BRQ+31YQc5wCKVhThQAzBQUvJ5boFdV gdELKHGgf0GFCq0am/4G1iQYd94DPfvVzg== X-Google-Smtp-Source: ABdhPJzRYkPguEteHyXKY87/v0o5h+ephqU/GWU6fMOdXtn9oiPXR4I2RLKhLY9RvhjxKhMSdha4CA== X-Received: by 2002:a6b:4402:: with SMTP id r2mr17139497ioa.168.1591533964624; Sun, 07 Jun 2020 05:46:04 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id v15sm6354969ila.57.2020.06.07.05.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 05:46:04 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Stefan Bosch , Simon Glass Subject: [PATCH v4 5/6] patman: Avoid importing gitutil in settings Date: Sun, 7 Jun 2020 06:45:49 -0600 Message-Id: <20200607064527.v4.5.I8db962ff2277f925bb61dd867627a0104c687760@changeid> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200607124550.212732-1-sjg@chromium.org> References: <20200607124550.212732-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Pass this module in so that settings does not need to import it. Signed-off-by: Simon Glass Reported-by: Stefan Bosch Signed-off-by: Simon Glass Reported-by: Stefan Bosch --- (no changes since v3) Changes in v3: - Add more patches based on testing on a dusty Ubuntu 14.04 Changes in v2: - Update gitutil as well tools/patman/main.py | 2 +- tools/patman/settings.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/patman/main.py b/tools/patman/main.py index 0974c84059..0df2aa5a98 100755 --- a/tools/patman/main.py +++ b/tools/patman/main.py @@ -80,7 +80,7 @@ specified by tags you place in the commits. Use -n to do a dry run first.""" # Parse options twice: first to get the project and second to handle # defaults properly (which depends on project). (options, args) = parser.parse_args() -settings.Setup(parser, options.project, '') +settings.Setup(gitutil, parser, options.project, '') (options, args) = parser.parse_args() if __name__ != "__main__": diff --git a/tools/patman/settings.py b/tools/patman/settings.py index ca74fc611f..635561ac05 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -11,7 +11,6 @@ import os import re from patman import command -from patman import gitutil from patman import tools """Default settings per-project. @@ -185,7 +184,7 @@ def ReadGitAliases(fname): fd.close() -def CreatePatmanConfigFile(config_fname): +def CreatePatmanConfigFile(gitutil, config_fname): """Creates a config file under $(HOME)/.patman if it can't find one. Args: @@ -301,7 +300,7 @@ def GetItems(config, section): except: raise -def Setup(parser, project_name, config_fname=''): +def Setup(gitutil, parser, project_name, config_fname=''): """Set up the settings module by reading config files. Args: @@ -318,7 +317,7 @@ def Setup(parser, project_name, config_fname=''): if not os.path.exists(config_fname): print("No config file found ~/.patman\nCreating one...\n") - CreatePatmanConfigFile(config_fname) + CreatePatmanConfigFile(gitutil, config_fname) config.read(config_fname) From patchwork Sun Jun 7 12:45:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1304687 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=mrNZWrWH; 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 49fx3V3tZbz9sQx for ; Sun, 7 Jun 2020 22:47:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C0D198120B; Sun, 7 Jun 2020 14:46:22 +0200 (CEST) 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="mrNZWrWH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E85C80462; Sun, 7 Jun 2020 14:46:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) (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 E0968808E0 for ; Sun, 7 Jun 2020 14:46:06 +0200 (CEST) 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-io1-xd36.google.com with SMTP id y5so15508122iob.12 for ; Sun, 07 Jun 2020 05:46:06 -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=xG56TrFq0uzwiZEG5oDLtaMJwSzMo+mPj7XzI6zt6w0=; b=mrNZWrWHb2sZfGlUn992RwkO1LSZf0c5yXpQYC2Fy8hX/4D47ru6mWHSp26LLVZdHv 5PSqTtaHXOHzqlCLKJWgycpdDr2sWSiqPYfTLydvcZ3POC+Afu8mJmK0Ka3N6f/+jdha /mHrOfnc57PTMa7Svi2rNAtnglnmMqE3ZjPvw= 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=xG56TrFq0uzwiZEG5oDLtaMJwSzMo+mPj7XzI6zt6w0=; b=hFrlHRWQQ07sQ6KC+OANAAmfXk3Uz1bEJIkpEbqKbjYEJA17DcIneJhPU1Qgt5iOJp LeZgXGE6s6VJJuTsfekFQxuJqQpUFFscYRfRCxaeJLt6Ht+AMAkZ89xs6MTK2tAyP03Z qI9L46svWkj8OUTvyauYKWvGHqA623WvcvSNn9f2HtMvZgdq5ttT+egyiS4n+Cco0Utc H8TP523lOlsSkrfqvbBb5HUrH/+Gkq73h3xTbIACD4OGPNWAn+PgDI4U2dIXNCaKgV/1 A0dcA1V4v/ZfJuBRF1BjuEMJLffaNDkWwGpjNkIffTmHSTPNPt2NRhv6qiRTsCOfAESz y03w== X-Gm-Message-State: AOAM531/M5kcvtgbtJItNxOiRKfjug/I7P7Sh17jyhzk35Wz5/71dMq5 7PeWW1cppbSSVgLZzXJT4RwBfeSFeSIbsQ== X-Google-Smtp-Source: ABdhPJxdaX6VwqEJimJNYKkGHprH5+IDQ1iGcWy/W0OdKDtITg84zHHIZ8jL+lT4oTdaXVnq29jPsg== X-Received: by 2002:a6b:7b4a:: with SMTP id m10mr17409984iop.55.1591533965404; Sun, 07 Jun 2020 05:46:05 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id v15sm6354969ila.57.2020.06.07.05.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 05:46:05 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Stefan Bosch , Simon Glass Subject: [PATCH v4 6/6] patman: Drop import of test_util in test_util Date: Sun, 7 Jun 2020 06:45:50 -0600 Message-Id: <20200607064527.v4.6.Ic5afeedfd2cc29add1b642b2678f8de91899cf6b@changeid> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200607124550.212732-1-sjg@chromium.org> References: <20200607124550.212732-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean This module doesn't need to import itself. It causes problems on very old Python 3 (e.g. 3.4.0). Drop it. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- Changes in v4: - Add a new patch to drop import of test_util in test_util - Add a cover letter tools/patman/test_util.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py index 4d28d9fc92..aac58fb72f 100644 --- a/tools/patman/test_util.py +++ b/tools/patman/test_util.py @@ -11,7 +11,6 @@ import sys import unittest from patman import command -from patman import test_util from io import StringIO