From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web11.9651.1593704378781522468 for ; Thu, 02 Jul 2020 08:39:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=amBMbsd8; spf=pass (domain: nuviainc.com, ip: 209.85.221.41, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f41.google.com with SMTP id z15so17791653wrl.8 for ; Thu, 02 Jul 2020 08:39:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gVyDrr9YhoJ+34vR3IrO3D8XDBOfk47YbmOLV6fYVzw=; b=amBMbsd8UxtqrBzFRyPRyl8Omz4SAI4jYTvYStCEIWF5HCrsJttd2U0FjaPix+jRVq kiBktswkCXFippoBEJWURJtEWZuHotT6+hOisUtiAQmeOYuAUuZOJRIi+j1rAWTAbHDQ 1A1cbVhmTkH/HMXG3k5NLLD2jZ5qV3PVl7OLmwiY51B7pFOixAB8mp0A6rqtmmuPDN2Q IfatkEv4GvQUiwxKcGbrUsNxpF/F0MR7vXsgE4luFeW9WiAxDblHqt/hgcL6HI/RVSIx 2TAoWHTHjyokhKLzRoShxJREkuV38UPlMSewzrDERe+I79aQZiHFubbM1PbdnOHy5hh9 kzOA== 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=gVyDrr9YhoJ+34vR3IrO3D8XDBOfk47YbmOLV6fYVzw=; b=h8YwCF6NIyg4bg7fMXKOLNEjRMP93jQVLsC/KQwPJ3LdINPqkm7eC6+wsmOqlwPbyM A0LzepyGN04ovNK9cEEwOlcst6JsOBCN+J2StogE4LEeVak894NKvfnD7G7V05gIO31m o0xZ+KLEK9M840wLvjNXgHIz01DQD9Se5AnpmuMLM+febI55cSsipuDMHjXX9XsmOGxu sfj/yB2sB6q/sfynifm23SMxqjbtSrPKbL436oN6VVirhqt2QgQCyxnTHKLOiFjj3Hue ipJP2M6r2tlJ40evRiXeEkpJQwuUeVWOrNKn2+H/VpyBwgWA2qT6rIumOzrw3B098HFp Tw5g== X-Gm-Message-State: AOAM533n/Uq3qEgwMpn2LdoEPXkJ+vfWDOGwf/Q9gKjCUZ2ogLwyxOe9 vxj9Guw3gzju2rAw3gtKc1OuaEA6AceVyHFl9RlD5NE+kQ4Gthhl22LA+MMAQmq2xdT/jyTFIPS V6iC+UXDd2+gALrbq2kj3Vmw9Hac01FyEqUUh4EtQSVhA9NWZT8kBAPWPFP5/O4y8Tw== X-Google-Smtp-Source: ABdhPJw0RsBQlpMWwBE45ohRx60y9V5x5uW3g0de2TLcoL1efynXPXj2IpDB32jiNnIIjUKeK507cQ== X-Received: by 2002:a5d:4051:: with SMTP id w17mr30766799wrp.183.1593704377080; Thu, 02 Jul 2020 08:39:37 -0700 (PDT) Return-Path: Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id e5sm11540205wrs.33.2020.07.02.08.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 08:39:36 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH 2/2] BaseTools: explicitly import email.header PatchCheck.py Date: Thu, 2 Jul 2020 16:39:34 +0100 Message-Id: <20200702153934.25262-3-leif@nuviainc.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200702153934.25262-1-leif@nuviainc.com> References: <20200702153934.25262-1-leif@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On Debian 10 (Buster), when running PatchCheck.py with python2, a backtrace is printed, starting from: File "../edk2/BaseTools/Scripts/PatchCheck.py", line 595, in find_patch_pieces parts = email.header.decode_header(pmail.get('subject')) AttributeError: 'module' object has no attribute 'header' When using python3, this backtrace does not appear. Explicitly importing email.header resolves this for python2 and does not appear to cause any issues with python3. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Leif Lindholm --- BaseTools/Scripts/PatchCheck.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 527761986d4c..52244b0bc4d8 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -20,6 +20,8 @@ import re import subprocess import sys +import email.header + class Verbose: SILENT, ONELINE, NORMAL = range(3) level = NORMAL -- 2.20.1