From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 000C2D8026F for ; Fri, 10 Nov 2023 19:53:13 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=RG3+zoxwKbp1cTWzu9CjPtCBDX+G1lv+++jo7pTYRp4=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1699645992; v=1; b=WSXZCmHuSH+ubYbEQ9uyUixSqETXACjVYdZd4j/HnVzuQVvBExTebz12ynRbeg4yH95E8sbA qrbNqwdn5O4qnpE2kkMh7Iy6miR1mh2KXncgOVfIbQRagq1ZWqMYm/4z3TmNnDE2rUUM3z81Jpm vKsA1Yhe3kqUdALlliLrlLIw= X-Received: by 127.0.0.2 with SMTP id BVVmYY7687511xJF24IRijWF; Fri, 10 Nov 2023 11:53:12 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.37844.1699645991777571515 for ; Fri, 10 Nov 2023 11:53:11 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="369559372" X-IronPort-AV: E=Sophos;i="6.03,293,1694761200"; d="scan'208";a="369559372" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 11:53:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="1095255877" X-IronPort-AV: E=Sophos;i="6.03,293,1694761200"; d="scan'208";a="1095255877" X-Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga005.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 10 Nov 2023 11:53:10 -0800 X-Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Fri, 10 Nov 2023 11:53:10 -0800 X-Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Fri, 10 Nov 2023 11:53:10 -0800 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Fri, 10 Nov 2023 11:53:10 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q7gofIpodcTIsowXM5oLH8G4KaT0S5hTQw0cY6Gti/Y9x1fsqicBoKU/drnG8obapcCle1aDfxv9ipUv+88sI8m/TuQfSGxvGbsccpwiNI/b6T/xzZwznpsGftYeKJWB/8GnPOTCtkbfMITHOjyyuaPoHcJP6i7cUwkbH/wDyktmkVF9GQ4JjPCZKQUV6X9uwqfQOXFdakTyuqS3T1XBmCPFLMLJxZZh8cIKLNlftX7MPjzJObLM7xiXrHo6K/Ori2hL/aKEUTO0m2wZYP1XG3wupXmnSapR5GAOJKbXR5DkbJN+uFwxoof/gwAMn4gpXCOHOLHq/wQyVulfFFXd2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1cqBzvYj3tnkt0aLIJq5PygkaKjiSSEPO4/K8tvgcms=; b=aRYl/BEbE+23EgxfquTb8Cn6zqfiWtx2qBdKlzIDs2nYmyce2LvOo98YXh7f30JEaBD3dn3gEuca6g7l1IiqVIoO55EQDOYy9OeVM8GPnaDoN9HGmXLA5TglHBUXC73dBxoJ1YdPg8r3Vbvt2GjRciuLD8RSHdMFL9KmjmbgG5dQjjK7CrGSv4jAPSTWZ8PA5aDKTnKV2XQDa5KX+pAYB/+V9gXLMLUK8d1FCvrpdzMqq940/MWoFc+xBs6wE9gtwdQQS9WvnVq3Ttnp8AhgcZrzuxYRcSJSHLZHxjJDHC6gCVVLg81AO1NxTaAmCd3oe37qmk2NiUCeHWshifa09A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from CO1PR11MB4929.namprd11.prod.outlook.com (2603:10b6:303:6d::19) by SN7PR11MB6800.namprd11.prod.outlook.com (2603:10b6:806:260::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Fri, 10 Nov 2023 19:53:08 +0000 X-Received: from CO1PR11MB4929.namprd11.prod.outlook.com ([fe80::ac67:8c2e:235d:db4f]) by CO1PR11MB4929.namprd11.prod.outlook.com ([fe80::ac67:8c2e:235d:db4f%4]) with mapi id 15.20.6977.018; Fri, 10 Nov 2023 19:53:08 +0000 From: "Michael D Kinney" To: Leif Lindholm , "devel@edk2.groups.io" CC: Rebecca Cran , "Gao, Liming" , "Feng, Bob C" , "Chen, Christine" , "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH v3 3/5] BaseTools/Scripts/GetMaintainer: refactor internal returns as dicts Thread-Topic: [PATCH v3 3/5] BaseTools/Scripts/GetMaintainer: refactor internal returns as dicts Thread-Index: AQHaFAyDA7no/3VqVk2OWHl0IN3K1LBz9rLw Date: Fri, 10 Nov 2023 19:53:08 +0000 Message-ID: References: <20231110193053.673595-1-quic_llindhol@quicinc.com> <20231110193053.673595-4-quic_llindhol@quicinc.com> In-Reply-To: <20231110193053.673595-4-quic_llindhol@quicinc.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CO1PR11MB4929:EE_|SN7PR11MB6800:EE_ x-ms-office365-filtering-correlation-id: 3cbda9db-d018-4764-c41f-08dbe226a979 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: H3b99cZ3JpdRVANuPMhgTzLFmgRYeM1MxjTL97dL3phyRjQ5vP8aTbfLk2zUoHtiJAC+cLb+bRzowTk6VE9cQV7KNBiTV5kt2b34k69TMcCty04OAm1bEXRxrYYeB5ZqmygXTXVU3FC3qILCU9BPE3rzH8ezHeHfOhEvF5RJPyLKkFTbnfach5ZUhhfezpiQ5pH+GpGBd1cp5Kt7lancGcXS/rBw73IYCEywFsygVPvzLAZ22BkiGJhN0WOd0vix9hc9hrSEoMiSrakJNQpqR5U+3KYUow73DursPotvdmovyyCcZttA0Co/VG/84oYMO9lkYwt/BdVIA0W22goGf103l/WfSUsEJZfBqn3+q7bF3dLXyWlNQ9l1KCOJ814gk/JYicPpegnYMIBZFBTFlP+O51B+6Z/ba9y17W935F6rOYSbJMgSZyrSjDFHxG8dZGpELjayKOOnLtFKMuo9KD2mEPF2VEZpf+Siq39NydfunRUtrosDGEcTI21RqLJFoFU1Ku5ZZ4ItDJ5m9TYnJM/GpT1Ms91Zc3HClIPvtGhyFwelczuQWsxXiQIvqm2MzKOVnMvF7L3g6QGTaCkWR+vqlj2sxG4f8tkx+pGJLCz2iEsUMCSpEmk2j41cGUrV x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?J8j41L2zBaOsifUGfBjBYKpiKYlh+vVKeptGr6v1rGLNSMzicyoDnAO5E2+2?= =?us-ascii?Q?YDzLsL/u0kTkTas3MGhVNepHibhBemHmNzlmv9D+Kv3rAXIbFMxHtE0DIs2B?= =?us-ascii?Q?Zr7QJXYHA25McCCKgxH68tTgqZIw3z/b+DvKT+TEeGbes0QUKL3+OOvOLbd4?= =?us-ascii?Q?L2DlaCzfEZutpxbQKbwyBrqLtOG749tEItH2+IfkruXCHn2SY7wgviSjx2vS?= =?us-ascii?Q?fDw6oVm07XZQ4T6ed8VUPcp67oerYtBrydiJBQTmAO5U5JN9HVFYKq9gnJPW?= =?us-ascii?Q?8wEvEON6OBWvbatLnVufq4Vz7xxZxKefxHi+x/cBrcA2EpurBTpRViH4JIqB?= =?us-ascii?Q?6R+7Wc4iIecomrdMB4KwZy/BYHjXHxAi/Ad9BrJcub0Djpan78TkVX+U6qlC?= =?us-ascii?Q?fpGA2HMAdkg/AK+8rlrZXGQmF+eYLGcFqrnHvZsHfLXg7nGP1lYTz7lM83Ae?= =?us-ascii?Q?fuyLHF4tqhvbjDXTxY0sxOz9J51t8tuS7NBl7KRHpnRlTYI+p/gIQXv01ZLq?= =?us-ascii?Q?m4teXvCN1sxPicDIGUOBZsjnx3/QwQLUSPEmLCL693ieArF66aWErbuoNOMk?= =?us-ascii?Q?MQ05sqDr8ZiY58wFxuTmTscQ5PH+0hpCQM+vJjtuHPiHeXrhC3mAwRHGeQOj?= =?us-ascii?Q?wRlhW64HazxYpyhiE/AH7FbTniyKKyYHRrJiazdc23fmCB704hHc8J01Tbw1?= =?us-ascii?Q?riFe+hIXsoTIhK+I39nKvGbj0PFi50Lc8DPbPFON3OLaPxX7qcSfpRr6MXvq?= =?us-ascii?Q?RXYGVJEYZpmXeIJoEkl/S5T96wg86Zxa9eo8URYPRaBM1Tg25P2QHRDz3ntb?= =?us-ascii?Q?yl/AesZvaLDLlcAj8g/yZ+R2CXEzW3VNc3toi5mafdTF8+A5GgHboPLmVUm/?= =?us-ascii?Q?a+6Eu7y7+kcC5r14bzI65Wl6jhSmu7VRUdtK+/UxDKXk6OMO7D0SFrqep9PA?= =?us-ascii?Q?FOl/I4POBSLBJjjzBdr4kNT3W+tr9gBupjafkQMAg9u8ZFTLEFRbsYH3AWw6?= =?us-ascii?Q?v2UGyzhRREJ9Xuffi/fDtinPW2+zdjPmgiO72NUBbD2ieXVp89rq1+THg2Es?= =?us-ascii?Q?IH6iEhq5LuI5nBv31TLLkgvlDC42s5kc0ovSJlWz+X5XxqSPdFBx2JcmM2dT?= =?us-ascii?Q?mFL8pTX6OOokEYEal7rYqPY52UAbBJgmdtt/OtqLqvRZJwOKLOp4fHi1uVtI?= =?us-ascii?Q?diW45vM6epi9/74in5fjbLk+HnbTj2KDR4/bZ61mIQC0MNoCYC4Qt7mCdffY?= =?us-ascii?Q?ofRpGRV/RtYOAuZN0WzVV1xhBdVd12FCzPsFtVlq+WX0WiscH/md8v+aBTS0?= =?us-ascii?Q?hhMulcnHFcVKe96m5CwJCZPcpXDQ2IV04PDtxTX8LWvU6Jp3VphXXS+w7/LK?= =?us-ascii?Q?Ij17Uk9gltomLV6xd6E6p6c3/ZANSWqlItDOgP9vFC+P4XYMVDbS0FHPBKr3?= =?us-ascii?Q?d8uhkLPzgcokjV2GnGNZscWkvB/pewT6eOFWBk/u9YoOhsWOCw9IMqDibo7w?= =?us-ascii?Q?SM8mXErI1n+vw8iFwHSrDBn2L/UsJ8P1/ENDAGjnl2rCuLTMU6sIotMlP7Iy?= =?us-ascii?Q?Rx9q6iWgOwwAje36nQxgjkrI7GAQvDZ4fT2lS802G6MA7kToPG4RWbdRk+Z7?= =?us-ascii?Q?5A=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4929.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cbda9db-d018-4764-c41f-08dbe226a979 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Nov 2023 19:53:08.2843 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: C3fbfBtQXZ6EDuNp3v2cSex2+bvC3rxRhpu7/bUpHDf26iyG/UP2apJLtlX4VjarfqxDWHWEAlYHbI3eSpHrTttDHhEYMZuXx7r3Y35cgYc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6800 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: WaoZuwV06akdGEVXf3U9xEtDx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=WSXZCmHu; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Hi Leif, Thank you for the addition cleanup. Reviewed-by: Michael D Kinney Mike > -----Original Message----- > From: Leif Lindholm > Sent: Friday, November 10, 2023 11:31 AM > To: devel@edk2.groups.io > Cc: Kinney, Michael D ; Rebecca Cran > ; Gao, Liming ; Feng, Bob > C ; Chen, Christine > Subject: [PATCH v3 3/5] BaseTools/Scripts/GetMaintainer: refactor > internal returns as dicts >=20 > To clean up interfaces, change the lookup functions to return > dictionaries > rather than multiple values. >=20 > Cc: Rebecca Cran > Cc: Liming Gao > Cc: Bob Feng > Cc: Yuwei Chen > Cc: Michael D Kinney > Signed-off-by: Leif Lindholm > --- > BaseTools/Scripts/GetMaintainer.py | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) >=20 > diff --git a/BaseTools/Scripts/GetMaintainer.py > b/BaseTools/Scripts/GetMaintainer.py > index cdcdff750635..cb3aadbbefb1 100644 > --- a/BaseTools/Scripts/GetMaintainer.py > +++ b/BaseTools/Scripts/GetMaintainer.py > @@ -96,7 +96,7 @@ def get_section_maintainers(path, section): > else: > lists +=3D [address] >=20 > - return maintainers, lists > + return {'maintainers': maintainers, 'lists': lists} >=20 > def get_maintainers(path, sections, level=3D0): > """For 'path', iterates over all sections, returning maintainers > @@ -104,22 +104,24 @@ def get_maintainers(path, sections, level=3D0): > maintainers =3D [] > lists =3D [] > for section in sections: > - tmp_maint, tmp_lists =3D get_section_maintainers(path, section) > - maintainers +=3D tmp_maint > - lists +=3D tmp_lists > + recipients =3D get_section_maintainers(path, section) > + maintainers +=3D recipients['maintainers'] > + lists +=3D recipients['lists'] >=20 > if not maintainers: > # If no match found, look for match for (nonexistent) file > # REPO.working_dir/ > print('"%s": no maintainers found, looking for default' % > path) > if level =3D=3D 0: > - maintainers =3D get_maintainers('', sections, > level=3Dlevel + 1) > + recipients =3D get_maintainers('', sections, > level=3Dlevel + 1) > + maintainers +=3D recipients['maintainers'] > + lists +=3D recipients['lists'] > else: > print("No maintainers set for project.") > if not maintainers: > return None >=20 > - return maintainers + lists > + return {'maintainers': maintainers, 'lists': lists} >=20 > def parse_maintainers_line(line): > """Parse one line of Maintainers.txt, returning any match group > and its key.""" > @@ -184,9 +186,8 @@ if __name__ =3D=3D '__main__': >=20 > for file in FILES: > print(file) > - addresslist =3D get_maintainers(file, SECTIONS) > - if addresslist: > - ADDRESSES +=3D addresslist > + recipients =3D get_maintainers(file, SECTIONS) > + ADDRESSES +=3D recipients['maintainers'] + recipients['lists'] >=20 > for address in list(OrderedDict.fromkeys(ADDRESSES)): > if '<' in address and '>' in address: > -- > 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111069): https://edk2.groups.io/g/devel/message/111069 Mute This Topic: https://groups.io/mt/102513771/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-