From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web08.15321.1605409393298944262 for ; Sat, 14 Nov 2020 19:03:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=y41FxB4i; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: oZHZtwrm+JH36t0XsVcBP2SISfS3ig72pTVF8727n/TMoN+8vHL/tQM3K5Rb7pvr5aJrVgI8S4 aRMBRZnH7u2A== X-IronPort-AV: E=McAfee;i="6000,8403,9805"; a="169832980" X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="169832980" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2020 19:03:13 -0800 IronPort-SDR: /qw8Sl57+j++5RceKYIqtKMHvqsSJt/zT86IuWgvWg65XHi11vnkiOOYRfoy17hQcIq+sFkQL0 vDeM7knxKb7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="358029073" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP; 14 Nov 2020 19:03:13 -0800 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) 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.1713.5; Sat, 14 Nov 2020 19:03:12 -0800 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sat, 14 Nov 2020 19:03:12 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Sat, 14 Nov 2020 19:03:12 -0800 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (104.47.44.55) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Sat, 14 Nov 2020 19:03:12 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mtD8XhJKWRM1CIFCw95Wvc5LnRQ8ZrGJQJR8BjzgED1aLkj+Yx6aFifVtE57BDk3OKhVRIdIbq3PUyq7NnmcgXlRWny1eOi11zyaqU1xjSY14sT35VpqPWkpo7qboeHKKMYMnZaFfv5428+PUG70POjxMDM8jWDr6qDaSJ6yTja6WLjSWiKAKc31FYBLOJ1AuPnO/KnvpGOj6Vfbhh3+xS+PwMPOBnDObzME0o0zFZcPuAeahJWNMvuBn8oNroK3vU8oYt2IcJp7IdUB5QzgYBb7vU4EmlAJlfWIt+GZAKAClSUzdzo7A2aGHnNUXfsUSmoaZBFApTWNKBmJkNBFtw== 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-SenderADCheck; bh=GIAQXrrb4GOz4FH8sKzPQPEmJycqiEG/kan6QJHhDFs=; b=WzR1uLDBGjyqULm9bnH2QyJ1KCsO0e2c8LxouRl2F1HaHK/PRnSVUq4Gp+J49eUU2cQj2cbXVTHDFiyf1LY+nrBGF3L64EeS2xMssdKWmLfZahvbMDTXj7kdnYXG3vKc8/a9UmUaOgJ0RCtb5nNblkIiznzh/MHhrRvdnbe6InwwN6QOknX07BjOzK8gz6VeZNwtGzPZhKXh7NqzjZyWd1mvVztYZQZsdAt/i0qoZPctmzgiUdB3KsejPjOSVM43tr8KhESdbYQzhjzNPQQIi1RtEuee1XaMWVL6NZzW6V7vi/+ouOkdfhVKLgbjdkjVJ8JrujOkZwNbChCdDAlnIA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GIAQXrrb4GOz4FH8sKzPQPEmJycqiEG/kan6QJHhDFs=; b=y41FxB4iPVS3Sl74Fxg4wZoatOPcvXT6nu5EEe0RDsfGCQ1QI7QaufmoRRu2743g8UbYrW68dh7GmibE+xY4tcW4zAivP3/SkB9bjsYxriLS7RdBYfYxVZkAXS4DVXT3A4uPBnq2xnDcWCUj6geNDhB6njUAUtSZlz2UoyHs9Jo= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by MWHPR11MB1918.namprd11.prod.outlook.com (2603:10b6:300:110::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Sun, 15 Nov 2020 03:03:10 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::3161:c00f:c5c5:f710]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::3161:c00f:c5c5:f710%8]) with mapi id 15.20.3564.028; Sun, 15 Nov 2020 03:03:10 +0000 From: "Nate DeSimone" To: "Desimone, Ashley E" , "devel@edk2.groups.io" CC: "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" , "Bjorge, Erik C" Subject: Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload Thread-Topic: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload Thread-Index: AQHWuIQ3ePCdfQdV80edVLR1giKdSqnIhqCw Date: Sun, 15 Nov 2020 03:03:10 +0000 Message-ID: References: <20201111234136.1825-1-ashley.e.desimone@intel.com> In-Reply-To: <20201111234136.1825-1-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [50.53.190.176] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f8b84fc7-bc62-42c2-3add-08d88912fc2e x-ms-traffictypediagnostic: MWHPR11MB1918: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:268; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: MSezM7Bo5YCHXOMVpYcQExn3dV89eoIdKa/nDEZ8I0s5k9Gx5e3wKI9vnzR4Z1pS3qG5Ay34CMx6zSJzgNRrwy4jnANeuRDjIChkGvC4oTESOcj8KFvqAcoUwaRlmagJOSyV1EOMdVbD10eFjoJcPz2ysdRrnTejy+Fw6nb4zIroEqqP3K394JMLnLeiuxE9tVOHhLnT4kt14LSAgVLIJGOnaUvSVBaJjiODNDcu5xxPJDxTYoiAJIi8g8efguQDzOd822FnDF8lDJ2sWQhB4PHt/6A4HvSTAjVQPW+N2cWNF1yY0lnf9sIA/J38RLuovG/np2+R44hwNPI3YTmM/Gf94Zg9HdOvytSmwOOdzLA8Ee6qG+YiauofWoDbXOcxaaYmn+yAqixUaaL4jlQkhA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(366004)(136003)(346002)(376002)(39860400002)(316002)(55016002)(107886003)(54906003)(7696005)(9686003)(110136005)(478600001)(966005)(26005)(186003)(6506007)(86362001)(53546011)(33656002)(52536014)(83380400001)(66946007)(66476007)(66556008)(66446008)(2906002)(64756008)(76116006)(8936002)(4326008)(5660300002)(8676002)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 4W/EWUNTaCVihbTb6mZqikeHaLtfKmnQGSnB/Y/aqO+HoSIc6zFokwF4Xq28DRn2DNcIqzBQL5RwIoEFOH/iZIY22SJpgHHUBwtjQFtFLNrbp0czp2kHpPC7pvT/ruHxG4d3PdUpAeZrrDTqhr/6ARrmIuhBz/8/Vq+vPtPvBrT2BgxW/OecbQybGP4p3mf/8Wn444ZDYI7yysYzdbb41YGrEWemmHlA3lt667nqwHiqvxlYLOD2v+wiUfV8gtVwZH+EWQQ9sAyJlsLdMTNPVv9uxVPQ5Bwswo1BOx1I8VYGfVHptSefr/ui9++EWfdicXbTeYdJann+vmW9skLA17r5DrAxR3rSeHlyFCJO9ph3nrdhXQTzzKzLeQEbvvRN1xOgFWgImngodmLkLj5or/4jz8QqtIo7uUfc6O2SQZ3UJzLw3SuSRf24/jmp5EG3vHtkT8a+b5jcnF2gA+Xt+J1QAcEshnKnv6tnCiwyHy+RKrYvMu3lwswojH8xCn5vtTFJhvpy/7ihZqYQoEdQux8A/VCV338NEH7+otRrbsYhI/wDNel+LZj8AAsJKOclEs08C3pSsuCtI+h6LREh+nql9sYSgbTuqWIG5LTSMUcGmrWzGVB9m6vnB9VlcnXe89Fnqg+fekuSJfDHIJaveO99llssosdn/GqRbJROu1cu6iHt0oNJm+W/SWL3wkuj2m4d3HdeTTi6z2zals8iusr5XrC0GbX5jTVCjsDbZiRtsKy9dVueM4AvK0yYIMHTnDml8CIhB2oEuIn2kG2jCOHTs8+fOVDxKZcCaeiIUkyVilBvBoaXo6xLEmbNTwnEDMhkVICfFccXKYqlprNJ7XMKYCjH8skABvWPH8waTIkKgSMcf6u2NByzRRKgsH/KfgWdYa2grNdhxGWJD4tp8g== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8b84fc7-bc62-42c2-3add-08d88912fc2e X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2020 03:03:10.4750 (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: k39J2ptQjFDQZGZmX7OZzFv3bWFWWhXKyNo4hTUeHsupDbRpSdQSZjz9TnId7ERv/CG4Na0X3a766sFerMXslA3MHPFnbA0Tqoceq2FDym4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1918 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed: https://github.com/tianocore/edk2-staging/commit/405bee4 > -----Original Message----- > From: Ashley E Desimone > Sent: Wednesday, November 11, 2020 3:42 PM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Pandya, Puja > ; Bret Barkelew ; > Agyeman, Prince ; Bjorge, Erik C > > Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with > importlib.reload >=20 > The imp module is deprecated since Python 3.4 in favor of importlib. This > patch replaces uses of imp.reload() with importlib.reload() and removes > unused imp imports. >=20 > Cc: Ashley E Desimone > Cc: Nate DeSimone > Cc: Puja Pandya > Cc: Bret Barkelew > Cc: Prince Agyeman > Cc: Erik Bjorge > Signed-off-by: Ashley E Desimone > --- > edkrepo/__main__.py | 4 ++-- > edkrepo/edkrepo_cli.py | 1 - > edkrepo/edkrepo_entry_point.py | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) >=20 > diff --git a/edkrepo/__main__.py b/edkrepo/__main__.py index > 115a779..2d538d3 100644 > --- a/edkrepo/__main__.py > +++ b/edkrepo/__main__.py > @@ -7,7 +7,7 @@ > # SPDX-License-Identifier: BSD-2-Clause-Patent # >=20 > -import imp > +import importlib > import os > import sys > import site > @@ -23,7 +23,7 @@ for directory in sitepackages: > edkrepo_site_dir =3D edkrepo_package_path > break > else: > - imp.reload(edkrepo) > + importlib.reload(edkrepo) > import edkrepo.edkrepo_entry_point >=20 > if __name__ =3D=3D '__main__': > diff --git a/edkrepo/edkrepo_cli.py b/edkrepo/edkrepo_cli.py index > 4e7ff16..1adb63f 100644 > --- a/edkrepo/edkrepo_cli.py > +++ b/edkrepo/edkrepo_cli.py > @@ -18,7 +18,6 @@ import os > import subprocess > import site > import inspect > -import imp > import importlib.util > import datetime as dt >=20 > diff --git a/edkrepo/edkrepo_entry_point.py > b/edkrepo/edkrepo_entry_point.py index dd2b36e..30d65ff 100644 > --- a/edkrepo/edkrepo_entry_point.py > +++ b/edkrepo/edkrepo_entry_point.py > @@ -8,7 +8,7 @@ > # >=20 > import argparse > -import imp > +import importlib > import importlib.util > import inspect > import json > @@ -37,7 +37,7 @@ for directory in sitepackages: > edkrepo_site_dir =3D edkrepo_package_path > break > else: > - imp.reload(edkrepo) > + importlib.reload(edkrepo) > edkrepo_package_path =3D > os.path.dirname(os.path.dirname(edkrepo.__file__)) > for directory in sitepackages: > if edkrepo_package_path =3D=3D directory: > -- > 2.27.0.windows.1